summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-25 13:40:48 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-25 13:40:48 -0500
commit2be386826f177e865133e5c7ccd4fd345f923ac9 (patch)
tree2cef59d49832f8f62e48fae059c5ef1414c1089b /indra/newview/llinventorybridge.cpp
parentccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (diff)
parentc60165a93c4ee13dafa1c6eadbe1d19fb2cdec17 (diff)
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 9421cf5716..fedc45b1fb 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2385,6 +2385,8 @@ void LLFolderBridge::folderOptionsMenu()
if (is_sidepanel)
{
mItems.clear();
+ mItems.push_back("Rename");
+ mItems.push_back("Delete");
}
// Only enable calling-card related options for non-default folders.