diff options
| author | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-09 12:53:35 -0800 |
|---|---|---|
| committer | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-09 12:53:35 -0800 |
| commit | 874f53230dbe40e599e8903fae87a60816508fd6 (patch) | |
| tree | 6affd304d74261bd45f13eff4c1521b580ae8bc1 /indra/newview/llsidepanelinventory.cpp | |
| parent | 0bf7917ae848388a3e1bc6ad13e300880fed12d0 (diff) | |
| parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
merge
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 9ab459080e..ca7a3b663a 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -128,10 +128,6 @@ void LLSidepanelInventory::onOpen(const LLSD& key) mTaskPanel->setObjectSelection(LLSelectMgr::getInstance()->getSelection()); showTaskInfoPanel(); } - if (key.has("select")) - { - mPanelMainInventory->getPanel()->setSelection(key["select"].asUUID(), TAKE_FOCUS_NO); - } } void LLSidepanelInventory::onInfoButtonClicked() @@ -290,3 +286,8 @@ LLInventoryPanel *LLSidepanelInventory::getActivePanel() } return NULL; } + +BOOL LLSidepanelInventory::isMainInventoryPanelActive() const +{ + return mInventoryPanel->getVisible(); +} |