From df4d167cd13fd89a85e4d30dca94e40c934707d7 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 21 Dec 2007 06:44:41 +0000
Subject: svn merge -r74200:76302
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer -->
 release

Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
---
 indra/llcommon/llsys.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llcommon/llsys.h')

diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
index fc4e02763c..332d62c186 100644
--- a/indra/llcommon/llsys.h
+++ b/indra/llcommon/llsys.h
@@ -51,6 +51,7 @@ public:
 	void stream(std::ostream& s) const;
 
 	const std::string& getOSString() const;
+	const std::string& getOSStringSimple() const;
 
 	S32 mMajorVer;
 	S32 mMinorVer;
@@ -64,6 +65,7 @@ public:
 	static U32 getProcessResidentSizeKB();
 private:
 	std::string mOSString;
+	std::string mOSStringSimple;
 };
 
 
-- 
cgit v1.2.3