diff options
| author | Palmer <palmer@lindenlab.com> | 2010-03-05 13:11:26 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-03-05 13:11:26 -0800 |
| commit | b70951ca1e319e4d4a427a559072ee722588e1ed (patch) | |
| tree | 59f8edc208a98a3f74586a0458417a1ce14c00ff /indra/llcommon/llsys.cpp | |
| parent | dd663449b6f8b802892e11fab7cc2cbce36f734f (diff) | |
| parent | 32aa06139e6fb5f2e84d3e657dfbe8961170a804 (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); |