diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-04 11:56:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-04 11:56:36 -0400 |
| commit | c97def552af4564d81b68d36a5d7efc2dce56c54 (patch) | |
| tree | 73246cf5a4d5963225f611dc35b1f91c216536a5 /indra/newview/llviewermessage.cpp | |
| parent | 7f0de785585876f34366700d43c89514e37b006f (diff) | |
| parent | e32ce48d983c3a561dd05dc84eb7b2b7a3b788fb (diff) | |
merge fix for STORM-261
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 1 |
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) |