aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewlandmark.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/llpreviewlandmark.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/llpreviewlandmark.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 07addad..a8a510f 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -89,10 +89,12 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
89 inv_item), 89 inv_item),
90 mLandmark( NULL ) 90 mLandmark( NULL )
91{ 91{
92
93 mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this); 92 mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
94 if (show_keep_discard) 93 if (show_keep_discard)
95 { 94 {
95 // Move the notification in llviewermessage in the if/else there please.
96 // This class is no more called if show_keep_discard != TRUE -- Ele
97
96 // Decided against this, a text notification is a better fix for this -- McCabe 98 // Decided against this, a text notification is a better fix for this -- McCabe
97 //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap()); 99 //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
98 //childSetAction("Discard btn",onDiscardBtn,this); 100 //childSetAction("Discard btn",onDiscardBtn,this);