diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-04-19 14:12:42 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-04-19 14:12:42 +0300 |
| commit | 59d296e2008847b944678f6e3b873435e6d5f826 (patch) | |
| tree | a1463939ed33485a20f911f510deb55b37f78cb7 /indra/newview/llinventorybridge.cpp | |
| parent | 71c7b2f6d76b29c527d07c01c52127bf4f5b402e (diff) | |
Fixed major bug EXT-6682 (Emptying Lost & Found Folder can crash Viewer2.0 if recent item was added)
Reason: a pointer to renamed item was not nullified in Folder View when rename control lost focus.
Fix: updated focus lost callback to nullify the pointer to renamed item. Had to made this callback non-static to have access to Folder View's member pointer.
Also made "New..." menu items disabled for Lost & Found folder.
Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/251/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3071ef3b71..b85bf0d518 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2680,6 +2680,13 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { // This is the lost+found folder. mItems.push_back(std::string("Empty Lost And Found")); + + mDisabledItems.push_back(std::string("New Folder")); + mDisabledItems.push_back(std::string("New Script")); + mDisabledItems.push_back(std::string("New Note")); + mDisabledItems.push_back(std::string("New Gesture")); + mDisabledItems.push_back(std::string("New Clothes")); + mDisabledItems.push_back(std::string("New Body Parts")); } if(trash_id == mUUID) |