diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-08 14:01:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 14:01:28 -0500 |
| commit | c446062bd3bd3f172b20f22f2086cea962fb7278 (patch) | |
| tree | f208fb3a103cd6a6d38d98c366bc621c9f5f58e9 /indra/newview/llviewermessage.cpp | |
| parent | 14c9db3a52cbafa0d057e84657f9df11d7695638 (diff) | |
| parent | 2ab3b0cc346a573fc1c292a1466628ffc63b003f (diff) | |
merge fix for STORM-284
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) |