From b6d5909ddc06613c581dbd8a60dedf14ffb9d1fe Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Mar 2010 15:43:14 +0200
Subject: partitial fix for major EXT-4820  [NUX] Viewer dimensions on
 first-run need to specify desctop width and height for macos and linux (see
 LLDesctopInfo in llsys.cpp for details)

--HG--
branch : product-engine
---
 indra/llcommon/llsys.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

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

diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 0272c55db2..cb91a54f11 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -775,6 +775,34 @@ void LLMemoryInfo::stream(std::ostream& s) const
 #endif
 }
 
+S32 LLDisplayInfo::getDisplayWidth() const
+{
+#if LL_WINDOWS
+	return  ::GetSystemMetrics(SM_CXVIRTUALSCREEN);
+#elif LL_DARWIN
+	return 1024; //*FIXME
+#elif LL_SOLARIS
+	return 1024; //*FIXME
+else
+	return 1024; //*FIXME
+#endif
+}
+
+S32 LLDisplayInfo::getDisplayHeight() const
+{
+#if LL_WINDOWS
+	return  ::GetSystemMetrics(SM_CYVIRTUALSCREEN);
+#elif LL_DARWIN
+	return 768; //*FIXME
+#elif LL_SOLARIS
+	return 768; //*FIXME
+#else
+	return 768; //*FIXME
+#endif
+	
+}
+
+
 std::ostream& operator<<(std::ostream& s, const LLOSInfo& info)
 {
 	info.stream(s);
-- 
cgit v1.2.3


From 70000e0b1e43c510b4fd880284b77adaa3302ffc Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 4 Mar 2010 17:08:21 +0200
Subject: Fixed Win build.

--HG--
branch : product-engine
---
 indra/llcommon/llsys.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 36fec973b3..0ed700b9da 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -783,10 +783,9 @@ S32 LLDisplayInfo::getDisplayWidth() const
 	return 1024; //*FIXME
 #elif LL_SOLARIS
 	return 1024; //*FIXME
-else
+#else
 	return 1024; //*FIXME
 #endif
-	return 1024; // to make compiler happy
 }
 
 S32 LLDisplayInfo::getDisplayHeight() const
@@ -800,7 +799,6 @@ S32 LLDisplayInfo::getDisplayHeight() const
 #else
 	return 768; //*FIXME
 #endif
-	return 768; // to make compiler happy
 }
 
 
-- 
cgit v1.2.3