From 48fd4c8d14172ab9780d88bf204d1e4e56f2004e Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 5 Mar 2010 21:36:41 +0200
Subject: Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) -
 moved LLDisplayInfo to llwindow, implemented getting the width/height of
 screen for mac os and linux.

--HG--
branch : product-engine
---
 indra/llwindow/llwindowmacosx.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra/llwindow/llwindowmacosx.cpp')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index ad97bc45fc..5b21e06fe2 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -3464,6 +3464,26 @@ MASK LLWindowMacOSX::modifiersToMask(SInt16 modifiers)
 	return mask;
 }	
 
+// static
+S32 LLWindowMacOSX::getDisplayWidth()
+{
+	S32 width = 1024;
+	// Need to invoke cocoa before use getScreenSize()
+	setupCocoa();
+	getScreenSize(&width, NULL);
+	return width;
+}
+
+// static
+S32 LLWindowMacOSX::getDisplayHeight()
+{
+	S32 height = 768;
+	// Need to invoke cocoa before use getScreenSize()
+	setupCocoa();
+	getScreenSize(NULL, &height);
+	return height;
+}
+
 #if LL_OS_DRAGDROP_ENABLED
 
 OSErr LLWindowMacOSX::dragTrackingHandler(DragTrackingMessage message, WindowRef theWindow,
-- 
cgit v1.2.3