From 8a7606562b7396c39e392e8397bb759712c2170e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 3 Aug 2010 02:04:04 -0500
Subject: Use the correct setting name for LightShare.

---
 linden/indra/newview/lightshare.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

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()
 // static
 void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 {
-	if( gSavedSettings.getU32("UseLightShare") <= LIGHTSHARE_NEVER )
+	if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
 		return;
 
 	WindlightMessage* wl = new WindlightMessage(msg);
@@ -114,7 +114,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 
 	// If they are using region settings already, or LightShare is
 	// always allowed, just apply the new settings, don't bother asking.
-	if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ALWAYS ||
+	if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
 	    (sky == sSkyPresetName && water == sWaterPresetName) )
 	{
 		wl->apply();
@@ -138,7 +138,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 		return;
 	}
 
-	if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ASK &&
+	if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK &&
 	    sMostRecent == NULL )
 	{
 		// No most recent, so store this and create notification
-- 
cgit v1.1