aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lightshare.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-08-03 02:04:04 -0500
committerJacek Antonelli2010-08-03 02:04:04 -0500
commit8a7606562b7396c39e392e8397bb759712c2170e (patch)
tree2a388bb61f533b4dd1aecc8e7bb27592ce565ca5 /linden/indra/newview/lightshare.cpp
parentUpdated version to 1.3.0 RC1. (diff)
downloadmeta-impy-8a7606562b7396c39e392e8397bb759712c2170e.zip
meta-impy-8a7606562b7396c39e392e8397bb759712c2170e.tar.gz
meta-impy-8a7606562b7396c39e392e8397bb759712c2170e.tar.bz2
meta-impy-8a7606562b7396c39e392e8397bb759712c2170e.tar.xz
Use the correct setting name for LightShare.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lightshare.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index b422236..78d27b5 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -101,7 +101,7 @@ WindlightMessage::~WindlightMessage()
101// static 101// static
102void WindlightMessage::processWindlight(LLMessageSystem* msg, void**) 102void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
103{ 103{
104 if( gSavedSettings.getU32("UseLightShare") <= LIGHTSHARE_NEVER ) 104 if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
105 return; 105 return;
106 106
107 WindlightMessage* wl = new WindlightMessage(msg); 107 WindlightMessage* wl = new WindlightMessage(msg);
@@ -114,7 +114,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
114 114
115 // If they are using region settings already, or LightShare is 115 // If they are using region settings already, or LightShare is
116 // always allowed, just apply the new settings, don't bother asking. 116 // always allowed, just apply the new settings, don't bother asking.
117 if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ALWAYS || 117 if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
118 (sky == sSkyPresetName && water == sWaterPresetName) ) 118 (sky == sSkyPresetName && water == sWaterPresetName) )
119 { 119 {
120 wl->apply(); 120 wl->apply();
@@ -138,7 +138,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
138 return; 138 return;
139 } 139 }
140 140
141 if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ASK && 141 if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK &&
142 sMostRecent == NULL ) 142 sMostRecent == NULL )
143 { 143 {
144 // No most recent, so store this and create notification 144 // No most recent, so store this and create notification