Update Havok lib to 507006

Thu, 30 Nov 2017 15:53:53 +0100

author
Ansariel
date
Thu, 30 Nov 2017 15:53:53 +0100
changeset 53510
aa6cfd7d9a13
parent 53508
a583abe7a7f8
child 53511
dab15a0c45f0

Update Havok lib to 507006

autobuild.xml file | annotate | diff | revisions
indra/llmath/v4color.cpp file | annotate | diff | revisions
indra/llmath/v4color.h file | annotate | diff | revisions
indra/llmath/v4coloru.h file | annotate | diff | revisions
package_override_vc12.ini file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Thu Nov 30 10:55:51 2017 +0100
     1.2 +++ b/autobuild.xml	Thu Nov 30 15:53:53 2017 +0100
     1.3 @@ -1805,11 +1805,11 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>a0cea95fe336f624c712d1f5065ee1eb</string>
     1.8 +              <string>850bbb1e21572b101db1f07ec026b012</string>
     1.9                <key>hash_algorithm</key>
    1.10                <string>md5</string>
    1.11                <key>url</key>
    1.12 -              <string>file:///opt/firestorm/llphysicsextensions_tpv-1.0.507006-darwin64-507006.tar.bz2</string>
    1.13 +              <string>file:///opt/firestorm/llphysicsextensions_tpv-1.0.511060-darwin64-511060.tar.bz2</string>
    1.14              </map>
    1.15              <key>name</key>
    1.16              <string>darwin</string>
    1.17 @@ -1831,9 +1831,9 @@
    1.18              <key>archive</key>
    1.19              <map>
    1.20                <key>hash</key>
    1.21 -              <string>79f8d9dae7dcc4eb4a45435b9216780f</string>
    1.22 +              <string>27c1cd158e323af96026d85d2334caf5</string>
    1.23                <key>url</key>
    1.24 -              <string>file:///c:/cygwin/opt/firestorm/llphysicsextensions_tpv-1.0.300918-windows-300918.tar.bz2</string>
    1.25 +              <string>file:///c:/cygwin/opt/firestorm/llphysicsextensions_tpv-1.0.511060-windows-511060.tar.bz2</string>
    1.26              </map>
    1.27              <key>name</key>
    1.28              <string>windows</string>
     2.1 --- a/indra/llmath/v4color.cpp	Thu Nov 30 10:55:51 2017 +0100
     2.2 +++ b/indra/llmath/v4color.cpp	Thu Nov 30 15:53:53 2017 +0100
     2.3 @@ -122,11 +122,7 @@
     2.4  //////////////////////////////////////////////////////////////////////////////
     2.5  
     2.6  // conversion
     2.7 -#if defined(LL_WINDOWS) && !defined(ND_BUILD64BIT_ARCH)
     2.8 -LLColor4::operator const LLColor4U() const
     2.9 -#else
    2.10  LLColor4::operator LLColor4U() const
    2.11 -#endif
    2.12  {
    2.13  	return LLColor4U(
    2.14  		(U8)llclampb(ll_round(mV[VRED]*255.f)),
     3.1 --- a/indra/llmath/v4color.h	Thu Nov 30 10:55:51 2017 +0100
     3.2 +++ b/indra/llmath/v4color.h	Thu Nov 30 15:53:53 2017 +0100
     3.3 @@ -131,11 +131,7 @@
     3.4  		friend const LLColor4& operator*=(LLColor4 &a, const LLColor4 &b); // Doesn't multiply alpha! (for lighting)
     3.5  
     3.6  		// conversion
     3.7 -#if defined(LL_WINDOWS) && !defined(ND_BUILD64BIT_ARCH)
     3.8 -		operator const LLColor4U() const;
     3.9 -#else
    3.10  		operator LLColor4U() const;
    3.11 -#endif
    3.12  
    3.13  		// Basic color values.
    3.14  		static LLColor4 red;
     4.1 --- a/indra/llmath/v4coloru.h	Thu Nov 30 10:55:51 2017 +0100
     4.2 +++ b/indra/llmath/v4coloru.h	Thu Nov 30 15:53:53 2017 +0100
     4.3 @@ -120,11 +120,7 @@
     4.4  	static BOOL parseColor4U(const std::string& buf, LLColor4U* value);
     4.5  
     4.6  	// conversion
     4.7 -#if defined(LL_WINDOWS) && !defined(ND_BUILD64BIT_ARCH)
     4.8 -	operator const LLColor4() const
     4.9 -#else
    4.10  	operator LLColor4() const
    4.11 -#endif
    4.12  	{
    4.13  		return LLColor4(*this);
    4.14  	}
     5.1 --- a/package_override_vc12.ini	Thu Nov 30 10:55:51 2017 +0100
     5.2 +++ b/package_override_vc12.ini	Thu Nov 30 15:53:53 2017 +0100
     5.3 @@ -95,4 +95,4 @@
     5.4  windows  = http://downloads.phoenixviewer.com/vlc_bin-2.2.4.201608121201-windows64-201608121201.tar.bz2|035cd97ce22bd26cfe6eb80c411c40d4
     5.5  
     5.6  [llphysicsextensions_stub]
     5.7 -windows = file:///c:/cygwin/opt/firestorm/llphysicsextensions_tpv-1.0.507006-windows64-507006.tar.bz2|02be2996e6ec53656a460cf0b34bc000
     5.8 +windows = file:///c:/cygwin/opt/firestorm/llphysicsextensions_tpv-1.0.511060-windows64-511060.tar.bz2|65183e2fbd4044aeca35ff9e70ac38ac

mercurial