diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
| commit | 79e0e7d2980b28660716f43d0f0518a107117e83 (patch) | |
| tree | a5d506aa55aa6970b46ff1e493b6d5f9cb410470 /indra/llwindow/llopenglview-objc.h | |
| parent | e6b20328c2e25223359dede17357682b5b4e7ea1 (diff) | |
| parent | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (diff) | |
Merge upstream
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. |