summaryrefslogtreecommitdiff
path: root/indra/llwindow/llopenglview-objc.h
diff options
context:
space:
mode:
authorsimon <none@none>2014-02-18 16:41:21 -0800
committersimon <none@none>2014-02-18 16:41:21 -0800
commit52ce788d0cf77361dc337edaf136f401acd0d4a9 (patch)
tree10b483a50bb1f3d897ece66d118036201bd74af7 /indra/llwindow/llopenglview-objc.h
parent54ab932884c386950f4f31b9ee63446053c03d59 (diff)
parenta347267cf1c55a3bd57d30117b8aa834623e1d61 (diff)
Pull in viewer-lion to lock down next release
Diffstat (limited to 'indra/llwindow/llopenglview-objc.h')
-rw-r--r--indra/llwindow/llopenglview-objc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h
index 1e0e47cd02..f1fab3b2c6 100644
--- a/indra/llwindow/llopenglview-objc.h
+++ b/indra/llwindow/llopenglview-objc.h
@@ -42,6 +42,7 @@
unsigned int mMarkedTextLength;
bool mMarkedTextAllowed;
bool mSimulatedRightClick;
+ bool mOldResize;
}
- (id) initWithSamples:(NSUInteger)samples;
- (id) initWithSamples:(NSUInteger)samples andVsync:(BOOL)vsync;
@@ -49,6 +50,8 @@
- (void)commitCurrentPreedit;
+- (void) setOldResize:(bool)oldresize;
+
// rebuildContext
// Destroys and recreates a context with the view's internal format set via setPixelFormat;
// Use this in event of needing to rebuild a context for whatever reason, without needing to assign a new pixel format.