summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-27 13:01:55 -0500
committerOz Linden <oz@lindenlab.com>2011-01-27 13:01:55 -0500
commit3ef1a5a5d2334a0cd498e959b983e0cdf626eaef (patch)
treea461ec6fc7412cff158635afffb0c4336fcac470 /indra/newview/llpanellandmarks.h
parent3c1cafeac1312ec37ba80853e1b04e5768c20738 (diff)
parent3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (diff)
merge changes for beta fixes
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.