aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/newview/llpreviewlandmark.cpp10
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 @@
12 Ditto. 12 Ditto.
13 13
14 14
15 Armin Weatherwax <email@unknown.com>
16
17 * linden/indra/newview/llpreviewlandmark.cpp:
18 Removed search for non-existant floater_preview_new_landmark.xml.
19
20
152009-02-04 McCabe Maxsted <hakushakukun@gmail.com> 212009-02-04 McCabe Maxsted <hakushakukun@gmail.com>
16 22
17 * linden/indra/cmake/CopyWinLibs.cmake: 23 * 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,
90{ 90{
91 91
92 mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this); 92 mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
93 if (show_keep_discard) 93 LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
94 {
95 LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
96 childSetAction("Discard btn",onDiscardBtn,this);
97 }
98 else
99 {
100 LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
101 }
102 94
103 /* 95 /*
104 childSetCommitCallback("desc_editor", LLPreview::onText, this); 96 childSetCommitCallback("desc_editor", LLPreview::onText, this);