Merge server-release

2 files changed, 6 insertions, 6 deletions

diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index a3792c1f9d..deb87d7497 100755
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -321,7 +321,7 @@ public:
 		typedef std::vector<LLSD>::iterator			array_iterator;
 		typedef std::vector<LLSD>::const_iterator	array_const_iterator;
 		typedef std::vector<LLSD>::reverse_iterator reverse_array_iterator;
-
+		
 		array_iterator			beginArray();
 		array_iterator			endArray();
 		array_const_iterator	beginArray() const;
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index bb17725c9c..e63045659e 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -315,11 +315,11 @@ LLOSInfo::LLOSInfo() :
 					}
 					else
 					{
-						if(osvi.wProductType == VER_NT_WORKSTATION)
-							mOSStringSimple = "Microsoft Windows 8 ";
-						else
-							mOSStringSimple = "Windows Server 2012 ";
-					}
+					if(osvi.wProductType == VER_NT_WORKSTATION)
+						mOSStringSimple = "Microsoft Windows 8 ";
+					else
+						mOSStringSimple = "Windows Server 2012 ";
+				}
 				}
 
 				///get native system info if available..