diff options
author | Merov Linden <merov@lindenlab.com> | 2014-05-19 21:43:42 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-05-19 21:43:42 -0700 |
commit | 51865f4e94885471dba0402b33f0b11b72bbdb30 (patch) | |
tree | 3097df858573468d674ad5e4dee0e795cd498bc8 /indra/llwindow/llopenglview-objc.h | |
parent | 3eb53f5426a710b0403a84bd6849fe48553194eb (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Pull merge from lindenlab/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. |