diff options
| author | skolb <none@none> | 2009-12-03 14:33:38 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-03 14:33:38 -0800 |
| commit | faa188322a72b86b6a167834a4d2cd664da112bc (patch) | |
| tree | d498ee9f8642cf17d0b4555b0ad02db42ec73bb2 /indra/newview/llfloateropenobject.cpp | |
| parent | ec34503e0193514ffbb1ccb1249013adb0a9e320 (diff) | |
| parent | 4535fd64fbee1ee0dd3bfe54c090cfa9c56a11b6 (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); } } |