diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2010-03-18 16:38:44 +0200 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2010-03-18 16:38:44 +0200 |
commit | 11e4b42ec97df4154c29814e9568d43faab90cce (patch) | |
tree | 9f827558afb8d6720292823d883a94e6fcb2c239 /indra/llwindow/llwindow.cpp | |
parent | f318d936467113b94f654121f40cc0f0a9f4c3a4 (diff) | |
parent | c67bc96278ea76372d896fb82fc6f3557feac446 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
-rw-r--r-- | indra/llwindow/llwindow.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index b77deb003f..1c6c9e6e9d 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -407,30 +407,3 @@ BOOL LLWindowManager::isWindowValid(LLWindow *window) { return sWindowList.find(window) != sWindowList.end(); } - -S32 LLDisplayInfo::getDisplayWidth() const -{ -#if LL_WINDOWS - return LLWindowWin32::getDisplayWidth(); -#elif LL_DARWIN - return LLWindowMacOSX::getDisplayWidth(); -#elif LL_SDL - return LLWindowSDL::getDisplayWidth(); -#else - return 1024; //*FIXME -#endif -} - -S32 LLDisplayInfo::getDisplayHeight() const -{ -#if LL_WINDOWS - return LLWindowWin32::getDisplayHeight(); -#elif LL_DARWIN - return LLWindowMacOSX::getDisplayHeight(); -#elif LL_SDL - return LLWindowSDL::getDisplayHeight(); -#else - return 768; //*FIXME -#endif -} - |