diff options
Diffstat (limited to 'linden/indra/newview/llpreviewlandmark.cpp')
-rw-r--r-- | linden/indra/newview/llpreviewlandmark.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp index 7334f83..07addad 100644 --- a/linden/indra/newview/llpreviewlandmark.cpp +++ b/linden/indra/newview/llpreviewlandmark.cpp | |||
@@ -91,7 +91,17 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name, | |||
91 | { | 91 | { |
92 | 92 | ||
93 | mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this); | 93 | mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this); |
94 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap()); | 94 | if (show_keep_discard) |
95 | { | ||
96 | // Decided against this, a text notification is a better fix for this -- McCabe | ||
97 | //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap()); | ||
98 | //childSetAction("Discard btn",onDiscardBtn,this); | ||
99 | } | ||
100 | else | ||
101 | { | ||
102 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap()); | ||
103 | } | ||
104 | |||
95 | 105 | ||
96 | /* | 106 | /* |
97 | childSetCommitCallback("desc_editor", LLPreview::onText, this); | 107 | childSetCommitCallback("desc_editor", LLPreview::onText, this); |