summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateropenobject.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-12-18 14:38:46 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-12-18 14:38:46 +0200
commit198587423d0eb343c6091d9af97e4ad12860166e (patch)
tree18922a60b34b16bdb4df6941850d5565b7cb1d72 /indra/newview/llfloateropenobject.cpp
parent3bf89afebec3c535604789f0e2997598ac43bbe6 (diff)
parent2a49de3befff5e2b48a273f70a21f525b50a189c (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
-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)
{