diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
| commit | 68b62747edb7073dd3f4975e2b38388ae80d801c (patch) | |
| tree | 73730fdc31d3d74a2ba69ad156217299115cd810 /indra/newview/llsidepanelinventory.cpp | |
| parent | a1afe50feb1c42cc21c7f89b4187a8f7abe0c9fc (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
| -rwxr-xr-x | indra/newview/llsidepanelinventory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 040cbc22a6..2556714792 100755 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -160,7 +160,7 @@ BOOL LLSidepanelInventory::postBuild() { // UI elements from inventory panel { - mInventoryPanel = getChild<LLPanel>("sidepanel__inventory_panel"); + mInventoryPanel = getChild<LLPanel>("sidepanel_inventory_panel"); mInfoBtn = mInventoryPanel->getChild<LLButton>("info_btn"); mInfoBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onInfoButtonClicked, this)); @@ -309,7 +309,7 @@ void LLSidepanelInventory::observeInboxModifications(const LLUUID& inboxID) if (inboxID.isNull()) { - llwarns << "Attempting to track modifications to non-existent inbox" << llendl; + LL_WARNS() << "Attempting to track modifications to non-existent inbox" << LL_ENDL; return; } @@ -710,13 +710,13 @@ void LLSidepanelInventory::clearSelections(bool clearMain, bool clearInbox) if (inv_panel) { - inv_panel->clearSelection(); + inv_panel->getRootFolder()->clearSelection(); } } if (clearInbox && mInboxEnabled && mInventoryPanelInbox.get()) { - mInventoryPanelInbox.get()->clearSelection(); + mInventoryPanelInbox.get()->getRootFolder()->clearSelection(); } updateVerbs(); |