QAR-767 Combined maint-render-7 and maint-viewer-9 merge

merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated

3 files changed, 21 insertions, 7 deletions

diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 376b2ecc99..c3ffbcc8ed 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -101,6 +101,12 @@ void LLCurl::setCAFile(const std::string& file)
 	sCAFile = file;
 }
 
+//static
+std::string LLCurl::getVersionString()
+{
+	return std::string(curl_version());
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 LLCurl::Responder::Responder()
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index b7634d420f..0700befab3 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -134,6 +134,11 @@ public:
 	 * @ brief Set certificate authority path used to verify HTTPS certs.
 	 */
 	static void setCAPath(const std::string& path);
+
+	/**
+	 * @ brief Return human-readable string describing libcurl version.
+	 */
+	static std::string getVersionString();
 	
 	/**
 	 * @ brief Get certificate authority file used to verify HTTPS certs.
diff --git a/indra/llmessage/llmessageconfig.cpp b/indra/llmessage/llmessageconfig.cpp
index 0159eb3562..8f957f4ebf 100644
--- a/indra/llmessage/llmessageconfig.cpp
+++ b/indra/llmessage/llmessageconfig.cpp
@@ -52,13 +52,14 @@ static LLSD sMessages;
 class LLMessageConfigFile : public LLLiveFile
 {
 public:
-	LLMessageConfigFile()
-        : LLLiveFile(filename(), messageConfigRefreshRate)
+	LLMessageConfigFile() :
+		LLLiveFile(filename(), messageConfigRefreshRate),
+		mMaxQueuedEvents(0)
             { }
 
-    static std::string filename();
+	static std::string filename();
 
-    LLSD mMessages;
+	LLSD mMessages;
 	std::string mServerDefault;
 	
 	static LLMessageConfigFile& instance();
@@ -66,7 +67,7 @@ public:
 
 	/* virtual */ void loadFile();
 	void loadServerDefaults(const LLSD& data);
-	 void loadMaxQueuedEvents(const LLSD& data);
+	void loadMaxQueuedEvents(const LLSD& data);
 	void loadMessages(const LLSD& data);
 	void loadCapBans(const LLSD& blacklist);
 	void loadMessageBans(const LLSD& blacklist);
@@ -74,7 +75,10 @@ public:
 
 public:
 	LLSD mCapBans;
-	 S32 mMaxQueuedEvents;
+	S32 mMaxQueuedEvents;
+
+private:
+	static const S32 DEFAULT_MAX_QUEUED_EVENTS = 100;
 };
 
 std::string LLMessageConfigFile::filename()
@@ -125,7 +129,6 @@ void LLMessageConfigFile::loadServerDefaults(const LLSD& data)
 	mServerDefault = data["serverDefaults"][sServerName].asString();
 }
 
-const S32 DEFAULT_MAX_QUEUED_EVENTS = 100;
 void LLMessageConfigFile::loadMaxQueuedEvents(const LLSD& data)
 {
 	 if (data.has("maxQueuedEvents"))