merge changes for 3.7.3-release

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 3ae8a78845..05326c2baf 100755
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -86,6 +86,10 @@ public:
 
 	const LLOSInfo& getOSInfo() const { return mSysOSInfo; }
 
+	void setServerReleaseNotesURL(const std::string& url) { mServerReleaseNotesURL = url; }
+	LLSD getViewerInfo() const;
+	std::string getViewerInfoString() const;
+
 	// Report true if under the control of a debugger. A null-op default.
 	virtual bool beingDebugged() { return false; } 
 
@@ -246,6 +250,8 @@ private:
 	LLOSInfo mSysOSInfo; 
 	bool mReportedCrash;
 
+	std::string mServerReleaseNotesURL;
+
 	// Thread objects.
 	static LLTextureCache* sTextureCache; 
 	static LLImageDecodeThread* sImageDecodeThread;