Get user confirmation even when using default Windlight settings.

This might be end up being a bit annoying, but it limits the potential
for abuse (e.g. a bad script that cycles between light and dark could
trigger seizures in some users, and sheer annoyance in the rest).

We may want to add region whitelists and blacklists later.

1 files changed, 3 insertions, 4 deletions

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index 1d87ab1..28b3d97 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -112,10 +112,9 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
         std::string water = LLWaterParamManager::instance()->mCurParams.mName;
         std::string sky = LLWLParamManager::instance()->mCurParams.mName;
 
-        // If they are using the default or region settings, just apply
-        // the new settings, don't bother asking.
-        if( (sky == "Default" || sky == sSkyPresetName) &&
-            (water == "Default" || water == sWaterPresetName) )
+        // If they are using region settings already, just apply the new
+        // settings, don't bother asking.
+        if( sky == sSkyPresetName && water == sWaterPresetName )
         {
                 wl->apply();
                 delete wl;