From 1b92609dec6d2346f83f06455f7771ea6495480a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 14 Feb 2009 00:58:18 -0700
Subject: Removed search for non-existant floater_preview_new_landmark.xml
---
ChangeLog.txt | 6 ++++++
linden/indra/newview/llpreviewlandmark.cpp | 10 +---------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 65993fe..457e9ab 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -12,6 +12,12 @@
Ditto.
+ Armin Weatherwax <email@unknown.com>
+
+ * linden/indra/newview/llpreviewlandmark.cpp:
+ Removed search for non-existant floater_preview_new_landmark.xml.
+
+
2009-02-04 McCabe Maxsted <hakushakukun@gmail.com>
* linden/indra/cmake/CopyWinLibs.cmake:
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index dba603b..01d77f6 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,15 +90,7 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
{
mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
- if (show_keep_discard)
- {
- 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());
- }
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
/*
childSetCommitCallback("desc_editor", LLPreview::onText, this);
--
cgit v1.1