summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/SecondLife.nibbin15670 -> 15670 bytes
-rw-r--r--indra/newview/SecondLife.xib2
-rw-r--r--indra/newview/llappviewermacosx-delegate.h2
-rw-r--r--indra/newview/llappviewermacosx-delegate.mm3
4 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib
index b2495036a6..cd69b1b812 100644
--- a/indra/newview/SecondLife.nib
+++ b/indra/newview/SecondLife.nib
Binary files differ
diff --git a/indra/newview/SecondLife.xib b/indra/newview/SecondLife.xib
index 2fc83bd009..212bc5830d 100644
--- a/indra/newview/SecondLife.xib
+++ b/indra/newview/SecondLife.xib
@@ -1787,7 +1787,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">852</int>
+ <int key="maxID">864</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/indra/newview/llappviewermacosx-delegate.h b/indra/newview/llappviewermacosx-delegate.h
index ac234c14be..848ccbde62 100644
--- a/indra/newview/llappviewermacosx-delegate.h
+++ b/indra/newview/llappviewermacosx-delegate.h
@@ -12,12 +12,10 @@
@interface LLAppDelegate : NSObject <NSApplicationDelegate> {
LLNSWindow *window;
- LLOpenGLView *glview;
NSTimer *frameTimer;
}
@property (assign) IBOutlet LLNSWindow *window;
-@property (assign) IBOutlet LLOpenGLView *glview;
- (void) mainLoop;
diff --git a/indra/newview/llappviewermacosx-delegate.mm b/indra/newview/llappviewermacosx-delegate.mm
index 5c54736993..7baeeb1de8 100644
--- a/indra/newview/llappviewermacosx-delegate.mm
+++ b/indra/newview/llappviewermacosx-delegate.mm
@@ -11,7 +11,6 @@
@implementation LLAppDelegate
@synthesize window;
-@synthesize glview;
- (void)dealloc
{
@@ -23,7 +22,7 @@
frameTimer = nil;
setLLNSWindowRef([self window]);
- //setLLOpenGLViewRef([self glview]);
+
if (initViewer())
{
frameTimer = [NSTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(mainLoop) userInfo:nil repeats:YES];