summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2010-11-03 23:28:59 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2010-11-03 23:28:59 +0200
commit0a27fe695e6db2272ea1af02a897b5db33c8b70f (patch)
tree24ea91c7034cd238fb4e32a6f67bae1f562d631d
parent6a9e70053beaa0fb936482f5594137a8bcdf2f1e (diff)
STORM-194 FIXED 'Show' button in inventory offer notification to open 'My Inventory' SP if attachments were offered.
Removed the check preventing inventory SP from opening when an item of IT_ATTACHMENT type has been offered.
-rw-r--r--indra/newview/llviewermessage.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 672213d3e8..598ad7afc6 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1199,7 +1199,6 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
const BOOL auto_open =
gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false
!(asset_type == LLAssetType::AT_CALLINGCARD) && // don't open if it's a calling card
- !(item && (item->getInventoryType() == LLInventoryType::IT_ATTACHMENT)) && // don't open if it's an item that's an attachment
!from_name.empty(); // don't open if it's not from anyone.
LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
if(active_panel)