aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorelektrahesse2010-09-30 02:06:41 +0200
committerelektrahesse2010-09-30 02:06:41 +0200
commitdfc0367087c2948d745bfc6397641326b0f56854 (patch)
treed1d162b0324a33935cfd1916ff81f2ca50e0329b /linden/indra/newview/llviewermessage.cpp
parentFix for Bug #544 (diff)
downloadmeta-impy-dfc0367087c2948d745bfc6397641326b0f56854.zip
meta-impy-dfc0367087c2948d745bfc6397641326b0f56854.tar.gz
meta-impy-dfc0367087c2948d745bfc6397641326b0f56854.tar.bz2
meta-impy-dfc0367087c2948d745bfc6397641326b0f56854.tar.xz
Fix for "about landmark" crash when invoking it on a freshly received landmark.
Diffstat (limited to '')
-rwxr-xr-xlinden/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 35fd395..8fa0f64 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -922,7 +922,8 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
922 } 922 }
923 break; 923 break;
924 case LLAssetType::AT_LANDMARK: 924 case LLAssetType::AT_LANDMARK:
925 open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE); 925 if (!show_keep_discard)
926 open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), FALSE, LLUUID::null, FALSE);
926 break; 927 break;
927 case LLAssetType::AT_TEXTURE: 928 case LLAssetType::AT_TEXTURE:
928 open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE); 929 open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);