diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-12-18 13:24:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-12-18 13:24:29 -0600 |
| commit | 6aa71844a8949ab3c75b6cbe1a5f8cb811aa27b8 (patch) | |
| tree | e73b1d2847a33c7568688f85265913a69d1711a2 /indra/newview/llfloateropenobject.cpp | |
| parent | 5015886e1763887f534321790d56b6cee5a75dfa (diff) | |
| parent | d5b53eb483ec042d83859ec957dce7699c7469aa (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
| -rw-r--r-- | indra/newview/llfloateropenobject.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index c1e8d251ee..ec50ed596c 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -44,7 +44,6 @@ #include "llnotificationsutil.h" #include "lltextbox.h" -#include "llalertdialog.h" #include "llinventorybridge.h" #include "llfloaterinventory.h" #include "llinventorymodel.h" @@ -225,7 +224,6 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data) if (result == 0) { - LLFloaterInventory::showAgentInventory(); LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); if (active_panel) { |