diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-21 14:14:42 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-21 14:14:42 +0300 |
| commit | 4a999fe04414f5489c555dbd609e7bae1c2667d6 (patch) | |
| tree | c93505b07bbd7ca68ed7239655c42e7316b17ecd /indra/newview/llinventorybridge.cpp | |
| parent | 52abfbbc4a3fbf55379fab861a1312eb5cecbc4d (diff) | |
| parent | 842e5111ae2d0a83755ff902afa43dc84e45662b (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 4ac9edecbe..0b1408616e 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2598,8 +2598,6 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { mWearables=TRUE; } - mMenu = menu.getHandle(); - sSelf = getHandle(); } // Preemptively disable system folder removal if more than one item selected. @@ -2630,6 +2628,8 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) folders.push_back(category->getUUID()); } + mMenu = menu.getHandle(); + sSelf = getHandle(); LLRightClickInventoryFetchDescendentsObserver* fetch = new LLRightClickInventoryFetchDescendentsObserver(folders, FALSE); fetch->startFetch(); inc_busy_count(); |