diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-07 17:07:52 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-07 17:07:52 -0800 |
| commit | 5245fb69721bf4b70de85211da6721b0e0137e07 (patch) | |
| tree | ebd801ead082555abaa9005359b7aa2f1c2ffccb /indra | |
| parent | 0b4b03fe3e92f0991b8145a2ba8267a20ce53581 (diff) | |
merge fixes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index bf70bb66fa..4cbf27b725 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -903,6 +903,7 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open) if (!auto_open) return NULL; // D. Open the inventory side panel and use that. + LLSideTray *side_tray = LLSideTray::getInstance(); LLSidepanelInventory *sidepanel_inventory = dynamic_cast<LLSidepanelInventory *>(side_tray->getPanel("sidepanel_inventory")); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 39d69067da..8c0529e344 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -829,8 +829,6 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f for (std::vector<LLUUID>::const_iterator item_iter = items.begin(); item_iter != items.end(); ++item_iter) - const LLUUID lost_and_found_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND); - BOOL user_is_away = gAwayTimer.getStarted(); { const LLUUID& item_id = (*item_iter); LLInventoryItem* item = gInventory.getItem(item_id); @@ -839,6 +837,7 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f LL_WARNS("Messaging") << "Unable to show inventory item: " << item_id << LL_ENDL; continue; } + //////////////////////////////////////////////////////////////////////////////// // Don't highlight if it's in certain "quiet" folders which don't need UI // notification (e.g. trash, cof, lost-and-found). |