diff options
| author | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
| commit | 864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch) | |
| tree | de5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/newview/llfloateropenobject.cpp | |
| parent | 5d4959e3a107a6a40014528dd8e17e46bf128540 (diff) | |
| parent | 7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
| -rw-r--r-- | indra/newview/llfloateropenobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index 6caa0d60f9..56a86c2cb7 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -195,10 +195,10 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data) if (result == 0) { LLFloaterInventory::showAgentInventory(); - LLFloaterInventory* view = LLFloaterInventory::getActiveInventory(); - if (view) + LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); + if (active_panel) { - view->getPanel()->setSelection(cat->mCatID, TAKE_FOCUS_NO); + active_panel->setSelection(cat->mCatID, TAKE_FOCUS_NO); } } |