summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-07-20 12:50:13 -0400
committerLoren Shih <seraph@lindenlab.com>2010-07-20 12:50:13 -0400
commit2961992a7e135ca68e5d78b245ea9a43b4284e56 (patch)
tree7d059bba99498e2c9d521023e81073d0bfe5ae12 /indra
parent62040b686568410cdd87d12228b48f0b2ee12f1b (diff)
EXT-8448 FIXED [crashhunters] Crash in LLFolderBridge::folderOptionsMenu(), and Trash folder options incorrect
Minor fix to previous checkin for this crash. This fixes the UI issue where you're seeing the context options for the previous folder you clicked when you click on trash/library.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorybridge.cpp4
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();