diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-09-15 11:32:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-09-15 11:32:06 -0400 |
| commit | 53f29252bc055ac884de938814e70b4dba78ba8a (patch) | |
| tree | 18313de258ea61a6a80777c0213761bc368e76fc /indra/newview | |
| parent | 8e28257c57dac00ce30d2907f6c24120769eeb57 (diff) | |
[STORM-164] simplify sCurrent calculations for compatibility with gcc 4.4
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvosky.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index 0ac6b9117b..6b3e7873a1 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -139,10 +139,10 @@ protected: ~LLSkyTex(); - static S32 getResolution() { return sResolution; } + static S32 getResolution() { return sResolution; } static S32 getCurrent() { return sCurrent; } - static S32 stepCurrent() { return (sCurrent = (sCurrent + 1) % 2); } - static S32 getNext() { return ((sCurrent+1) % 2); } + static S32 stepCurrent() { sCurrent++; sCurrent &= 1; return sCurrent; } + static S32 getNext() { return ((sCurrent+1) & 1); } static S32 getWhich(const BOOL curr) { return curr ? sCurrent : getNext(); } void initEmpty(const S32 tex); |