(STORM-383) Context menu cannot be open for Landmark that are located in the My inventory->Trash folder


Submitter:	Seth ProductEngine	Reviewers
Branch:		Groups:	viewer
Bugs:	STORM-383	People:
Change Number:	None	Repository:	viewer-development

Description:

Added "Restore Item" context menu entry for landmarks and folders in Trash category in Places->My Landmarks->My Inventory accordion tab.

Testing Done:

Expand All

indra/newview/llpanellandmarks.cpp (Diff revision 1)

Why are the checks for are_all_items_in_trash and are_any_items_in_trash different?

I guess it should be something like:

  bool item_in_trash = listenerp->isItemInTrash() && *iter != trash_id;
  are_all_items_in_trash &= item_in_trash;
  are_any_items_in_trash |= item_in_trash;

Seth ProductEngine Jan. 17, 2011, 8:12 a.m. (Jan. 17, 2011, 8:12 a.m.)

Probably it will look more pretty this way. But the checks should remain different in order not to enable "Restore Item" when Trash folder is selected and not to display an empty menu when some of the selected items are in Trash and some aren't.

indra/newview/llpanellandmarks.cpp (Diff revision 1)

Although we use the same approach in the Appearance SP for enabling/displaying context menu items, it may be not what users expect. Please clearly state this behavior in the ticket comment for PO to notice.

Diff
- added Diff r2

Description:

Minor style-related changes. Added comments.

Alright then.

You have a pending review.

Other reviews

Your comment

Review Board 1.6.11

This change has been marked as submitted.