Fixed bad LM patch side-effect

1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 01d77f6..20b0ee5 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,7 +90,17 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
         
         mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        if (show_keep_discard)
+        {
+                // Decided against this, a text notification is a better fix for this -- McCabe
+                //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
+                //childSetAction("Discard btn",onDiscardBtn,this);
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        }
+
 
         /*
         childSetCommitCallback("desc_editor", LLPreview::onText, this);