diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/llwindow/llopenglview-objc.h | |
parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/llwindow/llopenglview-objc.h')
-rw-r--r-- | indra/llwindow/llopenglview-objc.h | 3 |
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. |