From ba9c73eb9a3633ed48f64e2c4c6fa6f65baae3bb Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 2 Nov 2015 19:34:34 +0100 Subject: [PATCH] Open inventory and select new item if using V3 inventory accept messages and we click on "Show" for an item that cannot be previewed --- indra/newview/llviewermessage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 9df473e4eb..edeb03bc9d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1483,9 +1483,9 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam //////////////////////////////////////////////////////////////////////////////// // Highlight item - // Only show if either ShowInInventory is true OR we use legacy - // accept messages and clicked on the show button and the asset is not previewable - const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") || (from_agent && gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && !check_asset_previewable(asset_type)); + // Only show if either ShowInInventory is true OR it is an inventory + // offer from an agent and the asset is not previewable + const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") || (from_agent && !check_asset_previewable(asset_type)); //gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false //!from_name.empty(); // don't open if it's not from anyone. // Don't mess with open inventory panels when ShowInInventory is FALSE