diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-15 11:36:41 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-15 11:36:41 -0700 |
| commit | 3b2031e3ef82ceeeaf6fa45316ce7dbc1bbf7d97 (patch) | |
| tree | 509ad26077dfbbaf1bb85c3c4584d326d7532cbb /indra/newview/llvosky.h | |
| parent | cbed6ecd2be9849aae900ef17070d7bd2aa9542c (diff) | |
| parent | bf2849ef2346b41ab096c4c7ce44756e3e20cd27 (diff) | |
Merge in lenny build fixes.
Diffstat (limited to 'indra/newview/llvosky.h')
| -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); |