summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 07:21:51 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 07:21:51 -0500
commita426a4b65b4914c2469a0db1dbde4051b59c289b (patch)
tree4e801959d76b3acf2cb6d84bd07c65757ee6a50e /indra/newview/llpanellandmarks.h
parent8864a1b4db54b1ae5b335dec6372ee763b05ece9 (diff)
parent3015e4310564684702d5eb4c9be56c8870561706 (diff)
merge changes for storm-834
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
-rw-r--r--indra/newview/llpanellandmarks.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 8dcbca0440..b2f4e92473 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -129,6 +129,14 @@ private:
void onCustomAction(const LLSD& command_name);
/**
+ * Updates context menu depending on the selected items location.
+ *
+ * For items in Trash category the menu includes the "Restore Item"
+ * context menu entry.
+ */
+ void onMenuVisibilityChange(LLUICtrl* ctrl, const LLSD& param);
+
+ /**
* Determines if an item can be modified via context/gear menu.
*
* It validates Places Landmarks rules first. And then LLFolderView permissions.