aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-11-18 21:37:24 -0600
committerJacek Antonelli2009-11-18 21:37:24 -0600
commitf73676edead2ffa4f8f9c45cf8c84cefa1f6a365 (patch)
treec6b5f3eeb227458e2dc284510645e77719b562ce
parentUpdated Linux boost package to 1.39.0. (diff)
downloadmeta-impy-f73676edead2ffa4f8f9c45cf8c84cefa1f6a365.zip
meta-impy-f73676edead2ffa4f8f9c45cf8c84cefa1f6a365.tar.gz
meta-impy-f73676edead2ffa4f8f9c45cf8c84cefa1f6a365.tar.bz2
meta-impy-f73676edead2ffa4f8f9c45cf8c84cefa1f6a365.tar.xz
Fixed a compile blocker in LLVoSky::stepCurrent().
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llvosky.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5a50478..ce7eb67 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * Fixed a compile blocker in LLVoSky::stepCurrent().
4
5 modified: linden/indra/newview/llvosky.h
6
7
3 * Updated Linux boost package to 1.39.0. 8 * Updated Linux boost package to 1.39.0.
4 9
5 modified: install.xml 10 modified: install.xml
diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index 25c075e..efe5ef9 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -146,7 +146,7 @@ protected:
146 146
147 static S32 getResolution() { return sResolution; } 147 static S32 getResolution() { return sResolution; }
148 static S32 getCurrent() { return sCurrent; } 148 static S32 getCurrent() { return sCurrent; }
149 static S32 stepCurrent() { return (sCurrent = ++sCurrent % 2); } 149 static S32 stepCurrent() { return (sCurrent = (sCurrent+1) % 2); }
150 static S32 getNext() { return ((sCurrent+1) % 2); } 150 static S32 getNext() { return ((sCurrent+1) % 2); }
151 static S32 getWhich(const BOOL curr) { return curr ? sCurrent : getNext(); } 151 static S32 getWhich(const BOOL curr) { return curr ? sCurrent : getNext(); }
152 152