Merge commit 'jacek/next' into next

2 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b15c235..9f3acc7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,12 @@
 
 2009-11-08  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * Removed Advanced Water and Sky tabs from Windlight toolbar presets.
+          They don't fit the purpose of the preset list.
+
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+
+
         * Finally packaged up Mac libraries.
           flac, glib, gstreamer, gstreamer-plugins, jpeg-6b, liboil,
           libpng, libxml, neon, ogg-vorbis, openal, thoera.
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index f805763..20de2f5 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -154,11 +154,11 @@ void LLWindlightRemoteCtrl::refreshPresets()
                 }
                 
                 // insert separator and add World menu options
-                mPresetsCombo->addSeparator(ADD_BOTTOM);
-                mPresetsCombo->addSimpleElement(getString("atmosphere"), ADD_BOTTOM);
-                mPresetsCombo->addSimpleElement(getString("lighting"), ADD_BOTTOM);
-                mPresetsCombo->addSimpleElement(getString("clouds"), ADD_BOTTOM);
-                mPresetsCombo->addSimpleElement(getString("advanced_water"), ADD_BOTTOM);
+                // mPresetsCombo->addSeparator(ADD_BOTTOM);
+                // mPresetsCombo->addSimpleElement(getString("atmosphere"), ADD_BOTTOM);
+                // mPresetsCombo->addSimpleElement(getString("lighting"), ADD_BOTTOM);
+                // mPresetsCombo->addSimpleElement(getString("clouds"), ADD_BOTTOM);
+                // mPresetsCombo->addSimpleElement(getString("advanced_water"), ADD_BOTTOM);
                 mPresetsCombo->addSeparator(ADD_BOTTOM);
                 mPresetsCombo->addSimpleElement(getString("sunrise"), ADD_BOTTOM);
                 mPresetsCombo->addSimpleElement(getString("noon"), ADD_BOTTOM);