diff options
| author | Jacek Antonelli | 2009-02-15 19:58:57 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-02-15 20:06:17 -0600 |
| commit | 7552080406d6c54e981d2e26f3826e7457cdd5fb (patch) | |
| tree | e613b774b600367635484fd71770c7984e720576 /linden/indra/newview/llpreviewlandmark.cpp | |
| parent | Updated release notes for 1.1.0 RC1. (diff) | |
| parent | Merge branch '1.1.0-RC1-fixes' into next (diff) | |
| download | meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.zip meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.tar.gz meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.tar.bz2 meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.tar.xz | |
Merge commit 'mccabe/next' into next
Diffstat (limited to 'linden/indra/newview/llpreviewlandmark.cpp')
| -rw-r--r-- | linden/indra/newview/llpreviewlandmark.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
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); |