summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 15:11:20 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 15:11:20 -0500
commit2d6228b4e0454c7d82770748eb572258c402319c (patch)
tree5919547744782d0b7179d5fee77c12efc7c619ec /indra/newview/llpanellandmarks.h
parentf91a9c87e5e758ecd32111d901ff32d282b73fa7 (diff)
parentbb3be2c07f492577254ae9ace5675eb92d10f061 (diff)
merge changes for storm-874/ER-428: fix lost movement updates when walking
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.