diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-04 16:53:21 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-04 16:53:21 +0200 |
| commit | 99f5cc81519ce98f63531fae2782c0077553a4e8 (patch) | |
| tree | 1a9d22c41b931c0fb603999c281ecc7c7da186ce /indra/llcommon/llsys.cpp | |
| parent | 768c956e9837b55d7796f732ee16ae423eaeb780 (diff) | |
| parent | bb4e48e1d1eada7d0b6f94e7e693bd8341c15102 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 0272c55db2..36fec973b3 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -775,6 +775,35 @@ 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 + return 1024; // to make compiler happy +} + +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 + return 768; // to make compiler happy +} + + std::ostream& operator<<(std::ostream& s, const LLOSInfo& info) { info.stream(s); |