livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-3344, Only popup the inventory panel when we say we want to see it.

Arrehn 2011-11-26 14:35:32 -05:00
parent 9aba43147c
commit 6b7d187ee8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llinventorypanel.cpp
View File

@ -1202,8 +1202,11 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open)
if (res)
{
// Make sure the floater is not minimized (STORM-438).
if (active_inv_floaterp && active_inv_floaterp->isMinimized())
//if (active_inv_floaterp && active_inv_floaterp->isMinimized())
if (auto_open && active_inv_floaterp && active_inv_floaterp->isMinimized()) // AO: additionally only unminimize if we are told we want to see the inventory window.
{
active_inv_floaterp->setMinimized(FALSE);
}
return res;
}

6
indra/newview/llviewermessage.cpp
View File

@ -1283,9 +1283,9 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
////////////////////////////////////////////////////////////////////////////////
// Highlight item
const BOOL auto_open =
gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false
!from_name.empty(); // don't open if it's not from anyone.
const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory"); // AO: don't open if showininventory is false, otherwise ignore from_name.
//gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false
//!from_name.empty(); // don't open if it's not from anyone.
LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
if(active_panel)
{