diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-08 10:56:55 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-08 10:56:55 -0800 |
| commit | 5917029eefbd32d9db29e2359f9dcc805caeec60 (patch) | |
| tree | ab995985e3dcf011d9938ab78838b3f1e669ffab /indra/llcommon/llsys.cpp | |
| parent | 72c6dc9698d0815bfd5b9ebefb401d92c6337500 (diff) | |
| parent | 0e11e774f839abf4c7e051fc3b021fd6d470a092 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 0ed700b9da..0272c55db2 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -775,33 +775,6 @@ 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); |