diff options
| author | Armin Weatherwax | 2010-09-25 00:49:50 +0200 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 15:57:22 +0100 |
| commit | b5f6f8919b99e897ea4616e8df4a10b281f51826 (patch) | |
| tree | 31d951f19fe1cb803864a6377678c781535dd15b /linden | |
| parent | Force mime_types.xml to use gstreamer as default (diff) | |
| download | meta-impy-b5f6f8919b99e897ea4616e8df4a10b281f51826.zip meta-impy-b5f6f8919b99e897ea4616e8df4a10b281f51826.tar.gz meta-impy-b5f6f8919b99e897ea4616e8df4a10b281f51826.tar.bz2 meta-impy-b5f6f8919b99e897ea4616e8df4a10b281f51826.tar.xz | |
Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llvosky.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h index 5e23065..08038a5 100644 --- a/linden/indra/newview/llvosky.h +++ b/linden/indra/newview/llvosky.h | |||
| @@ -147,7 +147,7 @@ protected: | |||
| 147 | 147 | ||
| 148 | static S32 getResolution() { return sResolution; } | 148 | static S32 getResolution() { return sResolution; } |
| 149 | static S32 getCurrent() { return sCurrent; } | 149 | static S32 getCurrent() { return sCurrent; } |
| 150 | static S32 stepCurrent() { return (sCurrent = ++sCurrent % 2); } | 150 | static S32 stepCurrent() { sCurrent++; sCurrent&=1; return sCurrent; } |
| 151 | static S32 getNext() { return ((sCurrent+1) % 2); } | 151 | static S32 getNext() { return ((sCurrent+1) % 2); } |
| 152 | static S32 getWhich(const BOOL curr) { return curr ? sCurrent : getNext(); } | 152 | static S32 getWhich(const BOOL curr) { return curr ? sCurrent : getNext(); } |
| 153 | 153 | ||