summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-17 20:33:50 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-17 20:33:50 -0500
commit32aea4e72d83852fa24d71d6c8bbbf81d2be5741 (patch)
treee54166fd4e041cb50ddf0fc1595e5b033afb858a
parent4bc23bc07d9209075a0d1bc5dadd753545074594 (diff)
EXT-3552 : Opening a box and copy the items to inventroy also opens an inventory floater
InventorySP/InventoryFloater open behavior now follows 2.0 conventions -- sidepanel will open in preference to floater.
-rw-r--r--indra/newview/llfloateropenobject.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index bc89f93763..ec50ed596c 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -224,7 +224,6 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
if (result == 0)
{
- LLFloaterInventory::showAgentInventory();
LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel();
if (active_panel)
{