diff options
| author | Runitai <> | 2009-12-15 16:53:29 -0600 |
|---|---|---|
| committer | Runitai <> | 2009-12-15 16:53:29 -0600 |
| commit | 1f8ad2651d82b81fc85d91f3d48663430427537e (patch) | |
| tree | c4ed86401b803aefdbfaa9eef6f87ecd5567c58d /indra/newview/llinventorybridge.cpp | |
| parent | a81a2f19b21134fb52df1e1a735988a04aa0688a (diff) | |
| parent | 88a146e0bb95476792d0fabedab6d7a41c350949 (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()); |