diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-04 14:33:25 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-04 14:33:25 -0800 |
| commit | 88cf648176f9ce8214516f4d81d8d1cd55cede2f (patch) | |
| tree | 9aac41a6c360fe826aaef02cbfd284e06f9b5770 /indra/llcommon/llsys.cpp | |
| parent | 34c8f6f7fa728c139a0da0deaccf6fda3d228680 (diff) | |
| parent | 14579a1ccab2817b019a61ffe1ac6b5edc3eb146 (diff) | |
Merge with tip
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); |