aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorelektrahesse2010-09-30 02:06:41 +0200
committerJacek Antonelli2010-10-01 16:42:03 -0500
commit63d4e6e2ecdcbd799d6ce28a7eab55640247277a (patch)
treef7f05a54dfb873f4814024f959e15a925652398d /linden/indra/newview/llviewermessage.cpp
parentPossible fix for an infinite loop in LLTextureCache. (diff)
downloadmeta-impy-63d4e6e2ecdcbd799d6ce28a7eab55640247277a.zip
meta-impy-63d4e6e2ecdcbd799d6ce28a7eab55640247277a.tar.gz
meta-impy-63d4e6e2ecdcbd799d6ce28a7eab55640247277a.tar.bz2
meta-impy-63d4e6e2ecdcbd799d6ce28a7eab55640247277a.tar.xz
Fix for "about landmark" crash when invoking it on a freshly received landmark.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermessage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index af4b8d8..0b5b381 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -913,7 +913,8 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
913 open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), LLUUID::null, show_keep_discard, LLUUID::null, FALSE); 913 open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
914 break; 914 break;
915 case LLAssetType::AT_LANDMARK: 915 case LLAssetType::AT_LANDMARK:
916 open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE); 916 if (!show_keep_discard)
917 open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), FALSE, LLUUID::null, FALSE);
917 break; 918 break;
918 case LLAssetType::AT_TEXTURE: 919 case LLAssetType::AT_TEXTURE:
919 open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE); 920 open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);