Local merge

1 files changed, 27 insertions, 0 deletions

diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 1c6c9e6e9d..b77deb003f 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -407,3 +407,30 @@ 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
+}
+