diff options
| author | James Cook <james@lindenlab.com> | 2009-12-18 10:50:29 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-18 10:50:29 -0800 |
| commit | eb501f3231aacb2fd97d8428bb2d25b818b26263 (patch) | |
| tree | 85a58ed7942c2b96b3e03c9e4dbd8237423e7696 /indra/newview/llfloateropenobject.cpp | |
| parent | b0fd284fbf72ef3a38ea64a61f8d5fe3e2e314b7 (diff) | |
| parent | ad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff) | |
Merge, pulling in viewer-2-0
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
| -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) { |