1 files changed, 31 insertions, 6 deletions

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index e7c3410..b2bbb96 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -48,6 +48,7 @@ const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
 
 WindlightMessage* WindlightMessage::sMostRecent = NULL;
 LLTimer* WindlightMessage::sIgnoreTimer = new LLTimer();
+bool WindlightMessage::sIgnoreRegion = false;
 
 
 WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
@@ -132,6 +133,13 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
                 return;
         }
 
+        if(sIgnoreRegion)
+        {
+                // We are ignoring new settings until user enters a new region.
+                delete wl;
+                return;
+        }
+
         if( sMostRecent == NULL )
         {
                 // No most recent, so store this and create notification
@@ -160,13 +168,23 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
 
-        if( option == 0 ) // "Apply"
+        switch(option)
         {
-                sMostRecent->apply();
-        }
-        else if( option == 2 ) // "Ignore"
-        {
-                resetIgnoreTimer();
+                case 0:{
+                        // "Apply"
+                        sMostRecent->apply();
+                        break;
+                }
+                case 1:{
+                        // "Not Now", ignore until the region stops spamming
+                        resetIgnoreTimer();
+                        break;
+                }
+                case 2:{
+                        // "Ignore", ignore all until user leaves the region
+                        sIgnoreRegion = true;
+                        break;
+                }
         }
 
         delete sMostRecent;
@@ -177,6 +195,13 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 
 
 // static
+void WindlightMessage::resetRegion()
+{
+        sIgnoreRegion = false;
+}
+
+
+// static
 void WindlightMessage::resetIgnoreTimer()
 {
         F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");