diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-10 14:28:54 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-10 14:28:54 -0800 |
| commit | 7eed962a6237f74ec980e06d53886259ef225c55 (patch) | |
| tree | 6f90cd7736c74164f5cfaff071ecfc9f63b7a46f /indra/newview/llviewermessage.cpp | |
| parent | b2e84d739b4f5c00b497e57e892fc10d78af8b76 (diff) | |
| parent | 9d33a548b636fa739de2aa11ba9ed02b301c53a5 (diff) | |
Merge
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) |