merge from viewer-2-0

1 files changed, 19 insertions, 0 deletions

diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 59b25e1726..5cab2619fd 100644
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -116,3 +116,22 @@ OSErr setImageCursor(CursorRef ref)
 	return noErr;
 }
 
+void getScreenSize(int* width, int* height)
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSRect screen_rect = [[NSScreen mainScreen] frame];
+	if (width)  *width  = (int)(screen_rect.size.width);
+	if (height) *height = (int)(screen_rect.size.height);
+	[pool release];
+}
+
+void getVisibleScreen(int *x, int *y, int* width, int* height)
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSRect visible_rect = [[NSScreen mainScreen] visibleFrame];
+	if (width)  *width = (int)(visible_rect.size.width);
+	if (height) *height = (int)(visible_rect.size.height);
+	if (x) *x = (int)(visible_rect.origin.x);
+	if (y) *y = (int)(visible_rect.origin.y);
+	[pool release];
+}