From d982c1938f6bff25b433845db479a2506d2b0b11 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 1 May 2010 16:32:22 +0200
Subject: Make server version change popup optional, also optionally chat it.

---
 linden/indra/newview/app_settings/settings.xml | 26 ++++++++++++++++++++++++++
 linden/indra/newview/llviewermessage.cpp       | 17 ++++++++++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2bd56de..19ad234 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -9153,6 +9153,32 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+
+<!-- Begin: Notify Server Version Change -->
+    <key>ServerVersionChangedNotify</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not to show the server change as notify popup</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ServerVersionChangedChat</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not to show the server change as chat message</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+<!-- End: Notify Server Version Change -->
+
     <key>ShareWithGroup</key>
     <map>
       <key>Comment</key>
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;
-- 
cgit v1.1