diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:49:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:49:03 -0400 |
| commit | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (patch) | |
| tree | d57dc022d32f0a5c362860add8c697cddbd6842e /indra/newview/llviewermessage.cpp | |
| parent | a024493c04aea26b523d52971ab9cc1c9df5d08b (diff) | |
| parent | d27a695b0be6c16e11a8c06c23d59e4107523ef6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
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 0756e3559b..8b52d478e6 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) |