diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-10-13 20:20:09 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-10-13 20:20:09 +0300 |
| commit | 3732e0b4d2d0c311c6341bf479bbc4fa7387df0e (patch) | |
| tree | 1ca88fe8d140856687d9804f35fa75348449d9f0 /indra/llwindow | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
| parent | 4ec4bf3711757c71ea9007ed939efb17312fe0b6 (diff) | |
merge changes for MAINT-4734
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llopenglview-objc.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm index 1c9160a42d..deb8cb90d8 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -239,7 +239,11 @@ attributedStringInfo getSegments(NSAttributedString *str) { [glContext setValues:(const GLint*)1 forParameter:NSOpenGLCPSwapInterval]; } else { - [glContext setValues:(const GLint*)0 forParameter:NSOpenGLCPSwapInterval]; + // supress this error after move to Xcode 7: + // error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] + // Tried using ObjC 'nonnull' keyword as per SO article but didn't build + GLint swapInterval=0; + [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; } mOldResize = false; |