diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-11 10:08:37 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-11 10:08:37 -0800 |
| commit | 941497dd30c409a2f352b0bfc1c48bfaca5ea76e (patch) | |
| tree | ed7bdc596ee0a856f9739864239f75c64db85f50 /indra/newview/llfloateropenobject.cpp | |
| parent | 4b710367a1ac986e8be731bc391c0b375424148f (diff) | |
| parent | 0a8d9fa5b5d044bed7d4c38ec51d87bc90f3b3a6 (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); } } |