diff options
Diffstat (limited to 'linden/indra/newview/lightshare.cpp')
-rw-r--r-- | linden/indra/newview/lightshare.cpp | 7 |
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**) | |||
112 | std::string water = LLWaterParamManager::instance()->mCurParams.mName; | 112 | std::string water = LLWaterParamManager::instance()->mCurParams.mName; |
113 | std::string sky = LLWLParamManager::instance()->mCurParams.mName; | 113 | std::string sky = LLWLParamManager::instance()->mCurParams.mName; |
114 | 114 | ||
115 | // If they are using the default or region settings, just apply | 115 | // If they are using region settings already, just apply the new |
116 | // the new settings, don't bother asking. | 116 | // settings, don't bother asking. |
117 | if( (sky == "Default" || sky == sSkyPresetName) && | 117 | if( sky == sSkyPresetName && water == sWaterPresetName ) |
118 | (water == "Default" || water == sWaterPresetName) ) | ||
119 | { | 118 | { |
120 | wl->apply(); | 119 | wl->apply(); |
121 | delete wl; | 120 | delete wl; |