diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
commit | abb23ff31260e9632406dae03be920a23220d719 (patch) | |
tree | a24029245cf2ca511f3893e1b42e04ac3e9a90db /indra/newview/llinventorybridge.cpp | |
parent | 9d8b189886ae14800d58f9729d8c8ea9b338ed52 (diff) | |
parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index d216872363..a44ce07d76 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2387,6 +2387,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. |