diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-17 17:47:41 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-17 17:47:41 -0800 |
| commit | 590187cd1de8f00d74dbc729eb02d39883bfe8fa (patch) | |
| tree | 2e46fb603c9b180891ad2fe6eff0405cb0e44d6c /indra | |
| parent | d8a574ce57bc7eb4efb643449c2815e1c3aee94e (diff) | |
| parent | 32aea4e72d83852fa24d71d6c8bbbf81d2be5741 (diff) | |
Merge.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloateropenobject.cpp | 1 |
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) { |