summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-03-09 23:01:58 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2011-03-09 23:01:58 +0200
commit174b537953b5a39702c833ab1e83313a80e5e549 (patch)
treea1a57d662886088d3ed421516a2fb60ea1310cf1 /indra
parent76a325b83271424d231561d8ef099df1406c9517 (diff)
STORM-28 ADDITIONAL FIX Pressing "Show" button in the offer notification opens Inventory SP and selects the received calling card.
Diffstat (limited to 'indra')
-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 947408f125..68807a6e65 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
// Highlight item
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
!from_name.empty(); // don't open if it's not from anyone.
LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
if(active_panel)