From 6b7d187ee8a2bb1f1dcc6137e3698732a788256e Mon Sep 17 00:00:00 2001 From: Arrehn Date: Sat, 26 Nov 2011 14:35:32 -0500 Subject: [PATCH] FIRE-3344, Only popup the inventory panel when we say we want to see it. --- indra/newview/llinventorypanel.cpp | 5 ++++- indra/newview/llviewermessage.cpp | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 0027d85766..de85cc772e 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -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; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index bf88a9575f..323fbdf933 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -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) {