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

FIRE-15886: Show item in inventory even if ShowInInventory is actually FALSE in case we use legacy accept messages, have chosen "Show" and the offered item is not previewable

Ansariel 2015-04-18 13:37:48 +02:00
parent fc7e96317c
commit 0599f39cff
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermessage.cpp
View File

@ -1476,7 +1476,9 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
////////////////////////////////////////////////////////////////////////////////
// Highlight item
const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory"); // AO: don't open if showininventory is false, otherwise ignore from_name.
// <FS:Ansariel> Only show if either ShowInInventory is true OR we use legacy
// accept messages and clicked on the show and the asset is not previewable
const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") || (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && !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.
// <FS:Ansariel> Don't mess with open inventory panels when ShowInInventory is FALSE