diff options
| author | Jacek Antonelli | 2010-08-03 02:04:04 -0500 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-07 06:22:45 -0700 |
| commit | b9c55ff11c030f7670b4e756a681a49ecdafed55 (patch) | |
| tree | 2527083e5cd9d83bbd51dbd3d66c3a78c4f8ba76 /linden | |
| parent | Updated RELEASE_NOTES.txt for 1.3.0 RC1. (diff) | |
| download | meta-impy-b9c55ff11c030f7670b4e756a681a49ecdafed55.zip meta-impy-b9c55ff11c030f7670b4e756a681a49ecdafed55.tar.gz meta-impy-b9c55ff11c030f7670b4e756a681a49ecdafed55.tar.bz2 meta-impy-b9c55ff11c030f7670b4e756a681a49ecdafed55.tar.xz | |
Use the correct setting name for LightShare.
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/lightshare.cpp | 6 |
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 |
| 102 | void WindlightMessage::processWindlight(LLMessageSystem* msg, void**) | 102 | void 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 |