Make server version change popup optional, also optionally chat it.

1 files changed, 14 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 7a52b84..c6f93ee 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3439,10 +3439,21 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
         if (!gLastVersionChannel.empty())
         {
-                LLSD payload;
-                payload["message"] = version_channel;
-                LLNotifications::instance().add("ServerVersionChanged", LLSD(), payload);
                 gHippoLimits->setLimits();
+
+                if (gSavedSettings.getBOOL("ServerVersionChangedChat"))
+                {
+                        LLChat chat;
+                        chat.mText = version_channel;
+                        LLFloaterChat::addChat(chat, FALSE, FALSE);
+                }
+
+                if (gSavedSettings.getBOOL("ServerVersionChangedNotify"))
+                {
+                        LLSD payload;
+                        payload["message"] = version_channel;
+                        LLNotifications::instance().add("ServerVersionChanged", LLSD(), payload);
+                }
         }
 
         gLastVersionChannel = version_channel;