diff options
author | David Walter Seikel | 2012-04-03 06:41:06 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-03 06:41:06 +1000 |
commit | 2617714f3436fdd7ec81ad3ceb58416b105a7664 (patch) | |
tree | 167d4c02cd5708e10261031afa60abddcec6ed20 /linden | |
parent | Yay for automated white space fixes. (diff) | |
download | meta-impy-2617714f3436fdd7ec81ad3ceb58416b105a7664.zip meta-impy-2617714f3436fdd7ec81ad3ceb58416b105a7664.tar.gz meta-impy-2617714f3436fdd7ec81ad3ceb58416b105a7664.tar.bz2 meta-impy-2617714f3436fdd7ec81ad3ceb58416b105a7664.tar.xz |
One more water notecard refactor.
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llfloaterwater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp index 1101a10..cbf62e1 100644 --- a/linden/indra/newview/llfloaterwater.cpp +++ b/linden/indra/newview/llfloaterwater.cpp | |||
@@ -62,6 +62,7 @@ | |||
62 | 62 | ||
63 | #include "llwaterparamset.h" | 63 | #include "llwaterparamset.h" |
64 | #include "llwaterparammanager.h" | 64 | #include "llwaterparammanager.h" |
65 | #include "llwlparammanager.h" | ||
65 | #include "llpostprocess.h" | 66 | #include "llpostprocess.h" |
66 | 67 | ||
67 | #include "wlfloaterwindlightsend.h" | 68 | #include "wlfloaterwindlightsend.h" |
@@ -662,7 +663,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData) | |||
662 | { | 663 | { |
663 | // Make sure we have a ".ww" extension. | 664 | // Make sure we have a ".ww" extension. |
664 | std::string name = comboBox->getSelectedItemLabel(); | 665 | std::string name = comboBox->getSelectedItemLabel(); |
665 | if(name.length() > 2 && name.compare(name.length() - 3, 3, ".ww") != 0) | 666 | if(!LLWLParamManager::isWaterSettingsNotecard(name)) |
666 | { | 667 | { |
667 | name += ".ww"; | 668 | name += ".ww"; |
668 | } | 669 | } |