diff options
author | skolb <none@none> | 2009-12-15 13:31:18 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-15 13:31:18 -0800 |
commit | dc9a62b5ab71868c6e9d3ff5c25a773a1135e974 (patch) | |
tree | c1f26801e3a1aa5cbbf7a918d5871bd0616442ac /indra/newview/llinventorybridge.cpp | |
parent | 589472a4e91d61b70d1f4184fc1c8e7918fb5606 (diff) | |
parent | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (diff) |
Merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index e361082f7b..e2f9663000 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3014,7 +3014,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, // everything in the active window so that we don't follow // the selection to its new location (which is very // annoying). - LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); + LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); if (active_panel) { LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get()); |