summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsys.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-03-04 15:43:14 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-03-04 15:43:14 +0200
commitb6d5909ddc06613c581dbd8a60dedf14ffb9d1fe (patch)
tree6c1f810e29c4ff735f70b56c7032194bd344c849 /indra/llcommon/llsys.cpp
parent6d5442fbbd3adc9a708b894d402c9719f2dfa324 (diff)
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
Diffstat (limited to 'indra/llcommon/llsys.cpp')
-rw-r--r--indra/llcommon/llsys.cpp28
1 files changed, 28 insertions, 0 deletions
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);