diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-16 09:09:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-16 09:09:48 -0500 |
| commit | 17ca7fc38d7abebd009396d6a2ad22edc3ed7836 (patch) | |
| tree | 9f51450de1270900e23fe1712e800caceb0cb52c | |
| parent | 058ac4ba50acb8f2b1340136a69bfe52ad7be425 (diff) | |
| parent | aa5a591aa722c81de2b22d9126afa4a833d0c050 (diff) | |
merge latest integrations from callum
| -rw-r--r-- | autobuild.xml | 18 | ||||
| -rw-r--r-- | indra/llrender/llrender.cpp | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/autobuild.xml b/autobuild.xml index e3b171b970..ee9c56384d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -650,9 +650,9 @@ <key>archive</key> <map> <key>hash</key> - <string>5fe125f2341501bc64848645d31b58ef</string> + <string>93257fce19120c01751362775a01b925</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/356/893/fmodex-4.44.61.500350-darwin64-500350.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1545/3481/fmodex-4.44.64.501533-darwin64-501533.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -674,9 +674,9 @@ <key>archive</key> <map> <key>hash</key> - <string>270c3eddbe2960d5edb8d316db063d07</string> + <string>89a75d8719f7b2cbe1e54cd8407bb992</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/355/888/fmodex-4.44.61.500350-linux64-500350.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1544/3476/fmodex-4.44.64.501533-linux64-501533.tar.bz2</string> </map> <key>name</key> <string>linux64</string> @@ -686,9 +686,9 @@ <key>archive</key> <map> <key>hash</key> - <string>ad5bb66f2aaa12636b5a69a020ea9f18</string> + <string>601c2fc41a18812a45678ef9a87ef772</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1191/2796/fmodex-4.44.61.501175-windows-501175.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1546/3486/fmodex-4.44.64.501533-windows-501533.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -698,16 +698,16 @@ <key>archive</key> <map> <key>hash</key> - <string>6722f0efc2b55542bd71514b9a09e377</string> + <string>e5cde35ae26ebfa256cfe670986e152e</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1190/2791/fmodex-4.44.61.501175-windows64-501175.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1547/3487/fmodex-4.44.64.501533-windows64-501533.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>4.44.61.501175</string> + <string>4.44.64.501533</string> </map> <key>fontconfig</key> <map> diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 0e242a20f6..98d3ab8435 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -2156,9 +2156,12 @@ void LLRender::vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, LLCol } } - mVerticesp[mCount] = mVerticesp[mCount-1]; - mTexcoordsp[mCount] = mTexcoordsp[mCount-1]; - mColorsp[mCount] = mColorsp[mCount-1]; + if (mCount > 0) + { + mVerticesp[mCount] = mVerticesp[mCount - 1]; + mTexcoordsp[mCount] = mTexcoordsp[mCount - 1]; + mColorsp[mCount] = mColorsp[mCount - 1]; + } } void LLRender::vertex2i(const GLint& x, const GLint& y) |