diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-01-20 17:17:15 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-01-20 17:17:15 +0200 |
| commit | 4028b720c9143b98097be51f49cc5d3dd664c8ec (patch) | |
| tree | 42bdee6e8a85c33691f58981223ba0b8ef0e24a2 /indra/newview/llviewermessage.cpp | |
| parent | 5183fa51f2a3f5b9f531877d30edb3aa62cc38b0 (diff) | |
Update for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6061d23477..066298de97 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -908,6 +908,14 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f LLSideTray::getInstance()->showPanel("panel_places", LLSD().with("type", "landmark").with("id", item->getUUID())); } + else if("group_offer" == from_name) + { + // do not open inventory when we open group notice attachment because + // we already opened landmark info panel + // "group_offer" is passed by LLOpenTaskGroupOffer + + continue; + } else if(from_name.empty()) { // we receive a message from LLOpenTaskOffer, it mean that new landmark has been added. @@ -961,7 +969,6 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") && (asset_type != LLAssetType::AT_CALLINGCARD) && (item->getInventoryType() != LLInventoryType::IT_ATTACHMENT) && - (asset_type != LLAssetType::AT_LANDMARK) && !from_name.empty(); LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open); if(active_panel) |