diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-27 18:11:47 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-27 18:11:47 +0200 |
| commit | 7563bb647048725e144fea34ea3cba426eed0ad1 (patch) | |
| tree | 55ca85ba1e195c74686162d2ece01b53e29f1610 /indra/llwindow | |
| parent | dd7dc1b4cae00ecd78e8ecfd5bb25aa861503596 (diff) | |
| parent | 2188da26bea8eff0538498c4e6caa69be53d6bbc (diff) | |
Merged lindenlab/viewer-lion into default
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; |