diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-04 15:31:35 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-04 15:31:35 -0500 |
| commit | f8916165f95606503b37eff7177674a57fe5d73e (patch) | |
| tree | 48906e70ba957772add46945e755a525ab563c51 /indra/llcommon/llsys.cpp | |
| parent | 2a60fdb1978de9dbe5b18ea3be9009ffc907eedd (diff) | |
| parent | b35ffd530488f0411dfc257e023a1b00c1c38eec (diff) | |
automated merge viewer2.0->viewer2.0
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); |