diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-05 13:17:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-05 13:17:37 -0700 |
| commit | a680d4fc1c30828fac63b1b9c6caee497c8f992a (patch) | |
| tree | eb3e979b508c5492185e9da41c148249dbed29fa /indra/newview/llviewermessage.cpp | |
| parent | f7af29ab40c2405504969a453eba3919be1af5c5 (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) | |
Pull from viewer-development
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) |