summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 15:41:51 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 15:41:51 -0500
commit08495d3f63e1e926e44185be07269ed40363024a (patch)
tree8e32278f96a14b36a4215e7fac16f68d072da961 /indra/newview/llinventorybridge.cpp
parent870d4449f5eec1c2a7e5e4627a0433846ab256aa (diff)
parent06f8017674295191d3c4400eacb36e34a167ffa5 (diff)
Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp2
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());