diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-04 11:23:56 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-04 11:23:56 -0800 |
| commit | 1201b24d41b285793c1b933c7aebd5a05fa0d27b (patch) | |
| tree | 2ed846daa0881400afa7c9e4a2411b6cd03afb2a /indra/llcommon/llsys.cpp | |
| parent | 96fd9253490cd35dca314d7719529b886a3df3ae (diff) | |
| parent | 50cc48de28fd472f7332f9bc306964afaa31d71f (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 0272c55db2..0ed700b9da 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -775,6 +775,33 @@ 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); |