diff options
author | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
commit | 0481494c2df074d2b548d6b80e595a208a2848c3 (patch) | |
tree | f3554fc49b549a4ae2b9d1e9a5f157e478ee38df /indra/llwindow/llopenglview-objc.h | |
parent | 4c7b0cb528f61bc20866c2f7c43049ef7bc49bf2 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with 3.7.8-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. |