summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAura Linden <obscurestar>2014-12-08 23:13:19 -0800
committerAura Linden <obscurestar>2014-12-08 23:13:19 -0800
commit5e2d5cc2e1662ba5d4fa760cc3d874d7357b8dd2 (patch)
tree902d32aecaee48a10de3b1fe2e09fd403c66f35d
parent161494cf3da4faa3ce1123527b0a1097870f66db (diff)
parent0524a4048bd6d4d4bcd12d73e874db9379a0c02a (diff)
Merged.
Diffstat
-rwxr-xr-x.hgignore1
-rwxr-xr-xautobuild.xml392
-rwxr-xr-xbuild.sh2
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/cmake/BuildPackagesInfo.cmake10
-rwxr-xr-xindra/cmake/Havok.cmake6
-rwxr-xr-xindra/llcommon/llpreprocessor.h5
-rwxr-xr-xindra/llcommon/llthread.cpp18
-rw-r--r--indra/llcommon/llthreadlocalstorage.h41
-rwxr-xr-xindra/newview/CMakeLists.txt2
-rwxr-xr-xindra/newview/llfloaterabout.cpp56
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_about.xml57
-rwxr-xr-xindra/newview/viewer_manifest.py24
-rwxr-xr-xindra/test/lltut.h4
-rwxr-xr-xscripts/packages-formatter.py73
15 files changed, 353 insertions, 339 deletions
diff --git a/.hgignore b/.hgignore
index f3fca9bcb2..10549b6144 100755
--- a/.hgignore
+++ b/.hgignore
@@ -17,6 +17,7 @@ build-linux-*
build-darwin-*
build-vc80/
build-vc100/
+build-vc120/
indra/build-vc[0-9]*
indra/CMakeFiles
indra/lib/mono/1.0/*.dll
diff --git a/autobuild.xml b/autobuild.xml
index e6c839c9d9..e14655be89 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -52,9 +52,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9a4b02734c5d0648d3d683cb1dc014cc</string>
+ <string>0c53148aa00e51c06fa246c4130915be</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/295252/arch/Darwin/installer/apr_suite-1.4.5.295252-darwin-295252.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/297252/arch/Darwin/installer/apr_suite-1.4.5.297252-darwin-297252.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -64,9 +64,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>f38c966a430012dc157fdc104f23a59b</string>
+ <string>402552cf158e2fe953b7224f4615a957</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/259951/arch/Linux/installer/apr_suite-1.4.5-linux-20120618.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/297252/arch/Linux/installer/apr_suite-1.4.5.297252-linux-297252.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -76,16 +76,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4a9d040582342699c58c886c5ccd2caf</string>
+ <string>8f865b509bb5011caf3dd95a22a4589d</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/259951/arch/CYGWIN/installer/apr_suite-1.4.5-windows-20120618.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/297252/arch/CYGWIN/installer/apr_suite-1.4.5.297252-windows-297252.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.4.5.295252</string>
+ <string>1.4.5.297252</string>
</map>
<key>ares</key>
<map>
@@ -130,16 +130,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>887c93c4075beefefa44b69fb2c0461e</string>
+ <string>f044de05e704d3f3fb6934adf42447c2</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-ares-update/rev/290399/arch/CYGWIN/installer/ares-1.10.0-windows-20140529.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/ares_3p-update-ares/rev/295506/arch/CYGWIN/installer/ares-1.10.0.295506-windows-295506.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.10.0.295020</string>
+ <string>1.10.0.295506</string>
</map>
<key>boost</key>
<map>
@@ -160,9 +160,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a8252cb5f0eae61ada2f02163e67b752</string>
+ <string>23f92889da917d0ebe542a77dab951ab</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/295616/arch/Darwin/installer/boost-1.56-darwin-295616.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/Darwin/installer/boost-1.57-darwin-297177.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -172,9 +172,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>2f076eae296600a1b810ce375dc4b42d</string>
+ <string>cf9b03e79742944200ad3ab214b06a07</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-boost-update/rev/290566/arch/Linux/installer/boost-1.55.0-linux-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/Linux/installer/boost-1.57-linux-297177.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -184,16 +184,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>8af0500013739866a41cfc2ce90e4f4b</string>
+ <string>37ea0a0d2e276bdc3aaf7cbf29ad8b1a</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-boost-update/rev/290566/arch/CYGWIN/installer/boost-1.55.0-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/CYGWIN/installer/boost-1.57-windows-297177.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.56</string>
+ <string>1.57</string>
</map>
<key>colladadom</key>
<map>
@@ -212,9 +212,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>7e64506a22e23ed9d677643d12fad2a9</string>
+ <string>7dfdc5abb5ee54ddb5cf34ff99fbf68e</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/295634/arch/Darwin/installer/colladadom-2.3.295634-darwin-295634.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/Darwin/installer/colladadom-2.3.297187-darwin-297187.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -224,9 +224,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>bdec5fe5fd008da4328f84115128ee61</string>
+ <string>94323c795f5af2aa7073156731b7f8ac</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-colladadom-update/rev/290576/arch/Linux/installer/colladadom-2.3-linux-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/Linux/installer/colladadom-2.3.297187-linux-297187.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -236,16 +236,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ae103c9481be20cd6c035940832b2650</string>
+ <string>904fc9bb513fc07b9d72312fa07d001b</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-colladadom-update/rev/290576/arch/CYGWIN/installer/colladadom-2.3-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/CYGWIN/installer/colladadom-2.3.297187-windows-297187.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>2.3.295634</string>
+ <string>2.3.297187</string>
</map>
<key>curl</key>
<map>
@@ -266,9 +266,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>37403a72882f9db3cda5bef4940bebba</string>
+ <string>d1c5125650a339a5209f429c70f4d395</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/296787/arch/Darwin/installer/curl-7.38.0.296787-darwin-296787.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/Darwin/installer/curl-7.38.0.297172-darwin-297172.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -278,9 +278,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d5328fae9c50e6cd6e0163d14c975815</string>
+ <string>ee6c089ee193e551040d610befc5d1c1</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/296787/arch/Linux/installer/curl-7.38.0.296787-linux-296787.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/Linux/installer/curl-7.38.0.297172-linux-297172.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -290,16 +290,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>642d6a95b7b7725f6daac73f128eac34</string>
+ <string>fdeca7cbc074a88d2701d74a31d21bd8</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/296787/arch/CYGWIN/installer/curl-7.38.0.296787-windows-296787.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/CYGWIN/installer/curl-7.38.0.297172-windows-297172.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>7.38.0.296787</string>
+ <string>7.38.0.297172</string>
</map>
<key>db</key>
<map>
@@ -405,9 +405,21 @@
<key>name</key>
<string>linux</string>
</map>
+ <key>windows</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>b0e66bcb304bef0c7715e0475529f7a8</string>
+ <key>url</key>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/296922/arch/CYGWIN/installer/dictionaries-1.296922-windows-296922.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>windows</string>
+ </map>
</map>
<key>version</key>
- <string>1.295189</string>
+ <string>1.296922</string>
</map>
<key>elfio</key>
<map>
@@ -452,9 +464,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>96ab90f72ba55842e7a19bd2573e875d</string>
+ <string>452d1910ef853329cd59858e6c5b2c48</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/295018/arch/Darwin/installer/expat-2.0.1.295018-darwin-295018.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/297014/arch/Darwin/installer/expat-2.0.1.297014-darwin-297014.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -464,9 +476,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>1ed2b8d927659b331951f2a7bf1c4d73</string>
+ <string>f546615d76bc0f9e8bc2b9ef89f0ca86</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/295191/arch/Linux/installer/expat-2.0.1.295191-linux-295191.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/297014/arch/Linux/installer/expat-2.0.1.297014-linux-297014.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -476,16 +488,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e72db1bda49b205ebdf4945d4ed2b8f8</string>
+ <string>c70c72a8a0a1e508691a9b35739b373f</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-2.0.1-windows-20110215.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/297014/arch/CYGWIN/installer/expat-2.0.1.297014-windows-297014.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>2.0.1.295191</string>
+ <string>2.0.1.297014</string>
</map>
<key>fmodex</key>
<map>
@@ -528,16 +540,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>6c859cd17fb8c9cdd96b188c2a2c2838</string>
+ <string>5aa7b826e7c1cf95e9cd3ef77e314f35</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/288122/arch/CYGWIN/installer/fmodex-4.44.31-windows-20140314.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/fmodex_3p-update-fmodex/rev/297261/arch/CYGWIN/installer/fmodex-4.44.31.297261-windows-297261.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>4.44.31.295607</string>
+ <string>4.44.31.297261</string>
</map>
<key>fontconfig</key>
<map>
@@ -565,8 +577,12 @@
</map>
<key>freeglut</key>
<map>
+ <key>copyright</key>
+ <string>Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.</string>
+ <key>description</key>
+ <string>freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library.</string>
<key>license</key>
- <string>mit</string>
+ <string>freeglut</string>
<key>license_file</key>
<string>LICENSES/freeglut.txt</string>
<key>name</key>
@@ -578,14 +594,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>825d5a9bafcc5bfe28dc4c1c4f87c576</string>
+ <string>58e328a8b2f3788f932c57ad77e3e117</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freeglut/rev/221064/arch/CYGWIN/installer/freeglut-2.6.0-windows-20110214.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freeglut_3p-update-freeglut/rev/295926/arch/CYGWIN/installer/freeglut-2.6.0.295926-windows-295926.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
+ <key>version</key>
+ <string>2.6.0.295926</string>
</map>
<key>freetype</key>
<map>
@@ -606,9 +624,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3994d486207118a7683a255677c20ed0</string>
+ <string>83618d16d974eb0af93926a10ac13297</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/295248/arch/Darwin/installer/freetype-2.4.4.295248-darwin-295248.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/297053/arch/Darwin/installer/freetype-2.4.4.297053-darwin-297053.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -618,9 +636,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>52f87a65cc61ec4b05721c079d015b19</string>
+ <string>1ac3152b440287c58509d8af0a50326d</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-freetype-update/rev/290557/arch/Linux/installer/freetype-2.4.4-linux-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/297053/arch/Linux/installer/freetype-2.4.4.297053-linux-297053.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -630,21 +648,25 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>6e9fc0fe628a7c88f6f614bf3b0450ae</string>
+ <string>207aa1a29bfe4ba63edbca38170970a1</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-freetype-update/rev/290557/arch/CYGWIN/installer/freetype-2.4.4-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/297053/arch/CYGWIN/installer/freetype-2.4.4.297053-windows-297053.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>2.4.4.295248</string>
+ <string>2.4.4.297053</string>
</map>
<key>glext</key>
<map>
+ <key>copyright</key>
+ <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
+ <key>description</key>
+ <string>glext headers define function prototypes and constants for OpenGL extensions</string>
<key>license</key>
- <string>glext</string>
+ <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
<key>license_file</key>
<string>LICENSES/glext.txt</string>
<key>name</key>
@@ -668,14 +690,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>5de58ca0fe19abf68b25956762ee0d29</string>
+ <string>6eb51c6f17e717a5617b112858d41c80</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glext_3p-update-glext/rev/296893/arch/CYGWIN/installer/glext-68-windows-296893.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
+ <key>version</key>
+ <string>68</string>
</map>
<key>glh-linear</key>
<map>
@@ -724,11 +748,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>22f347d243ed587e2b5e7d5329eaadb0</string>
+ <string>156abbd261be10ce68873ff0867b3845</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/295212/arch/CYGWIN/installer/glh_linear-0.0.0-windows-295212.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/297262/arch/CYGWIN/installer/glh_linear-0.0.0-windows-297262.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -782,18 +806,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>22fb3b3dcd433792e20ceada808ba54f</string>
+ <string>b0b32155319c6441997c034bdae28a22</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glod/rev/292477/arch/CYGWIN/installer/glod-1.0pre4-windows-292477.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glod_3p-update-glod/rev/296895/arch/CYGWIN/installer/glod-1.0pre4.296895-windows-296895.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.0pre4.295198</string>
+ <string>1.0pre4.296895</string>
</map>
<key>glui</key>
<map>
@@ -838,16 +862,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e006635a741420a15f40bbdac13bd8d7</string>
+ <string>b9e44910f2bd5139d752ac2ea19b5d85</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-windows-20110214.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glui_3p-update-glui/rev/297126/arch/CYGWIN/installer/glui-2.36.297126-windows-297126.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>2.36.295841</string>
+ <string>2.36.297126</string>
</map>
<key>google_breakpad</key>
<map>
@@ -892,16 +916,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a1e519d08c507c12f9d412b2ae8328c8</string>
+ <string>0af9ab8c34f4acb8b0c2ae56488ee0a9</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/279804/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130813.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/295565/arch/CYGWIN/installer/google_breakpad-1332.295565-windows-295565.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1332.294995</string>
+ <string>1332.295565</string>
</map>
<key>googlemock</key>
<map>
@@ -922,9 +946,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>0b7abee7091e958ee21ccbd1650d8641</string>
+ <string>f92fce4768ed687fe980e716af9d601e</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/295633/arch/Darwin/installer/googlemock-1.7.0.295633-darwin-295633.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/Darwin/installer/googlemock-1.7.0.297188-darwin-297188.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -934,9 +958,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3de99704847b34c7acccf5ab87222f6c</string>
+ <string>aa4da4a2e244be142fa07a097463601b</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/Linux/installer/gmock-1.7.0-linux-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/Linux/installer/googlemock-1.7.0.297188-linux-297188.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -946,16 +970,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>5d91c1d03780aa26bcd5481145ee9e86</string>
+ <string>46c17e436ad7385ff2e195228833c937</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/CYGWIN/installer/gmock-1.7.0-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/CYGWIN/installer/googlemock-1.7.0.297188-windows-297188.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.7.0.295633</string>
+ <string>1.7.0.297188</string>
</map>
<key>gperftools</key>
<map>
@@ -1000,16 +1024,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>f62841804acb91e1309603a84f3f0ce8</string>
+ <string>2946f9bbf227dee8881af43856ebb3a1</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/CYGWIN/installer/gperftools-2.0-windows-20120727.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-perftools_3p-update-google-perftools/rev/297263/arch/CYGWIN/installer/gperftools-2.0.297263-windows-297263.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>2.0.295031</string>
+ <string>2.0.297263</string>
</map>
<key>gstreamer</key>
<map>
@@ -1072,7 +1096,7 @@
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>ttp://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-gtk-atk-pango-glib/rev/289881/arch/CYGWIN/installer/gtk_atk_pango_glib-0.0-windows-289881.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-gtk-atk-pango-glib/rev/289881/arch/CYGWIN/installer/gtk_atk_pango_glib-0.0-windows-289881.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1081,10 +1105,10 @@
<key>version</key>
<string>0.0</string>
</map>
- <key>havok-source</key>
+ <key>havok_source</key>
<map>
<key>copyright</key>
- <string>The Havok software (the "Software") and the accompanying documentation (the "Documentation") supplied (collectively, the "Product") are protected by United States, Irish and international copyright laws, and the copyrights and other intellectual property rights are owned by Telekinesys Research Limited (trading as Havok) Third Floor, 6 Suffolk Street, Dublin 2, Ireland.</string>
+ <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
<key>description</key>
<string>Havok source code for libs and demos</string>
<key>license</key>
@@ -1092,7 +1116,7 @@
<key>license_file</key>
<string>LICENSES/havok.txt</string>
<key>name</key>
- <string>havok-source</string>
+ <string>havok_source</string>
<key>platforms</key>
<map>
<key>darwin</key>
@@ -1100,9 +1124,17 @@
<key>archive</key>
<map>
<key>hash</key>
+<<<<<<< local
<string>5c5b4820999ae9e398801d6a46f45897</string>
+=======
+ <string>5b7753a810a86f25df54ece3190b7d6e</string>
+>>>>>>> other
<key>url</key>
+<<<<<<< local
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297312/arch/Darwin/installer/havok_source-2012.1-darwin-297312.tar.bz2</string>
+=======
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/296959/arch/Darwin/installer/havok_source-2012.1-darwin-296959.tar.bz2</string>
+>>>>>>> other
</map>
<key>name</key>
<string>darwin</string>
@@ -1112,9 +1144,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>0c0d2058ba48446e274d6595d1d8063e</string>
+ <string>6b0f41ddddfa60d8424d8a2e0bc2077d</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/lindenlab_3p-havok-source/rev/268409/arch/Linux/installer/havok_source-2012.1-linux-20121219.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/296959/arch/Linux/installer/havok_source-2012.1-linux-296959.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1124,9 +1156,17 @@
<key>archive</key>
<map>
<key>hash</key>
+<<<<<<< local
<string>cb723dcc66dcddd9d372625644ba57b6</string>
+=======
+ <string>b03798edda7f8e9dad0b2df46a5137f1</string>
+>>>>>>> other
<key>url</key>
+<<<<<<< local
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297312/arch/CYGWIN/installer/havok_source-2012.1-windows-297312.tar.bz2</string>
+=======
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297157/arch/CYGWIN/installer/havok_source-2012.1-windows-297157.tar.bz2</string>
+>>>>>>> other
</map>
<key>name</key>
<string>windows</string>
@@ -1178,16 +1218,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a202ec58cef9097c94acfa958ed6da8d</string>
+ <string>98d3dc8d107d04b572fe47bd43a56e74</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-8c-windows-20110217.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jpeglib_3p-update-jpeglib/rev/296854/arch/CYGWIN/installer/jpeglib-8c.296854-windows-296854.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>8c.295876</string>
+ <string>8c.296854</string>
</map>
<key>jsoncpp</key>
<map>
@@ -1232,16 +1272,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>afff2018e6a887c281b072eecdd9343e</string>
+ <string>1a85cdf922d4b2e938766e543027bd3e</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110208.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297124/arch/CYGWIN/installer/jsoncpp-0.5.0.297124-windows-297124.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>0.5.0</string>
+ <string>0.5.0.297124</string>
</map>
<key>kdu</key>
<map>
@@ -1286,16 +1326,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>6d80d35524e1c0c32d3385014d02d48c</string>
+ <string>a0e5c050a4975c81611d9f1862ac57fb</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/256978/arch/CYGWIN/installer/kdu-7.0.0-windows-20120515.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/kdu_3p-update-kdu/rev/296932/arch/CYGWIN/installer/kdu-7.2.296932-windows-296932.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>7.2.295789</string>
+ <string>7.2.296932</string>
</map>
<key>libhunspell</key>
<map>
@@ -1340,16 +1380,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>6a140e5620826aa5e587b4157f57b389</string>
+ <string>ada0ad726842d902c09ab20a7ad5ac8f</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-hunspell/rev/259874/arch/CYGWIN/installer/libhunspell-1.3.2-windows-20120616.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/hunspell_3p-update-hunspell/rev/296916/arch/CYGWIN/installer/libhunspell-1.3.2.296916-windows-296916.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.3.2.295044</string>
+ <string>1.3.2.296916</string>
</map>
<key>libndofdev</key>
<map>
@@ -1394,16 +1434,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3a4bec9562ed6ac53e85abcb1afc5fc0</string>
+ <string>1c40c22fb7b84ccccefbf797e2478ec4</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libndofdev-0.1-windows-20110223.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libndofdev_3p-update-libndofdev/rev/297264/arch/CYGWIN/installer/libndofdev-0.1.297264-windows-297264.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>0.1.295599</string>
+ <string>0.1.297264</string>
</map>
<key>libpng</key>
<map>
@@ -1424,9 +1464,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>acba0d1d5349a2b895680c25f8252b9a</string>
+ <string>d837ee080fba5d521df4c43d5cb7fa78</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/295246/arch/Darwin/installer/libpng-1.6.8.295246-darwin-295246.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/Darwin/installer/libpng-1.6.8.297051-darwin-297051.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1436,9 +1476,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>82498b23cb74e6b957e62b8a676eaa66</string>
+ <string>6dec32fc2527f8cafd616f9271ff3478</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/295246/arch/Linux/installer/libpng-1.6.8.295246-linux-295246.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/Linux/installer/libpng-1.6.8.297051-linux-297051.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1448,16 +1488,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>596f4798f90941817b1ca5009c24d16a</string>
+ <string>a4a46193fd3c893c7cd2589d2e6d748d</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-libpng-update/rev/290558/arch/CYGWIN/installer/libpng-1.6.8-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/CYGWIN/installer/libpng-1.6.8.297051-windows-297051.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.6.8.295246</string>
+ <string>1.6.8.297051</string>
</map>
<key>libuuid</key>
<map>
@@ -1508,9 +1548,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>6f6c3409a09a6ddcb94301ead123c89f</string>
+ <string>9303f0dd174129e297eca6cc2eb1ab3f</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/295247/arch/Darwin/installer/libxml2-2.9.1.295247-darwin-295247.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/297050/arch/Darwin/installer/libxml2-2.9.1.297050-darwin-297050.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1520,9 +1560,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>7eb90f075730f8d7d176f8fb7bad5ef5</string>
+ <string>b8b584853dc1344bb3571c13b06ec39e</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-libxml-update/rev/290562/arch/Linux/installer/libxml2-2.9.1-linux-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/297050/arch/Linux/installer/libxml2-2.9.1.297050-linux-297050.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1532,16 +1572,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ba20e2634b4c249a7064620d135f7972</string>
+ <string>37fa0e86e54f5f283aa653d770fc8ed5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-libxml-update/rev/290562/arch/CYGWIN/installer/libxml2-2.9.1-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/297050/arch/CYGWIN/installer/libxml2-2.9.1.297050-windows-297050.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>2.9.1.295247</string>
+ <string>2.9.1.297050</string>
</map>
<key>llappearance_utility</key>
<map>
@@ -1767,8 +1807,12 @@
</map>
<key>nvapi</key>
<map>
+ <key>copyright</key>
+ <string>Copyright © 2012 NVIDIA Corporation. All rights reserved.</string>
+ <key>description</key>
+ <string>NVAPI provides an interface to NVIDIA devices.</string>
<key>license</key>
- <string>NVAPI</string>
+ <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
<key>license_file</key>
<string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
<key>name</key>
@@ -1780,14 +1824,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>baf519d36dffe4e4a59471450e391d01</string>
+ <string>9e30c9e228d6a825b6774b97ff052973</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-nvapi/rev/267102/arch/CYGWIN/installer/nvapi-304-windows-20121116.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/nvapi_3p-update-nvapi/rev/295118/arch/CYGWIN/installer/nvapi-304-windows-295118.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
+ <key>version</key>
+ <string>304</string>
</map>
<key>ogg_vorbis</key>
<map>
@@ -1832,16 +1878,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>25da868a1204203cfd31b449dad24d6d</string>
+ <string>f358717739c288ec7401d6d1936ef878</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-ogvorbis/rev/292448/arch/CYGWIN/installer/ogg_vorbis-1.2.2-1.3.2-windows-292448.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oggvorbis_3p-update-oggvorbis/rev/296878/arch/CYGWIN/installer/ogg_vorbis-1.2.2-1.3.2.296878-windows-296878.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.2.2-1.3.2.295493</string>
+ <string>1.2.2-1.3.2.296878</string>
</map>
<key>openal</key>
<map>
@@ -1876,18 +1922,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>de26ec439e0ca030dcda6b960fa73e8b</string>
+ <string>ca34d3f0f014ef6b8c445b6cacf4edc7</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-openal/rev/289850/arch/CYGWIN/installer/openal-1.12.854-1.1.0-windows-289850.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openal_3p-update-openal/rev/296861/arch/CYGWIN/installer/openal-1.12.854-1.1.0.296861-windows-296861.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.12.854-1.1.0.295049</string>
+ <string>1.12.854-1.1.0.296861</string>
</map>
<key>openjpeg</key>
<map>
@@ -1932,16 +1978,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ca5765af55f798724d601720afdf6953</string>
+ <string>b35adcf74d22c128045aa87aade74736</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-windows-20110302.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openjpeg_3p-update-openjpeg/rev/297018/arch/CYGWIN/installer/openjpeg-1.4.297018-windows-297018.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.4.295265</string>
+ <string>1.4.297018</string>
</map>
<key>openssl</key>
<map>
@@ -1962,9 +2008,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>c992a53924cf180fbd644c5fcacd3d92</string>
+ <string>0a77d56769e6075957f614be6575423e</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/295244/arch/Darwin/installer/openssl-1.0.1h.295244-darwin-295244.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/297168/arch/Darwin/installer/openssl-1.0.1h.297168-darwin-297168.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1974,9 +2020,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>0665c18f8cdbe2f90cb0a2f088cfe1a6</string>
+ <string>c310ba9971cbd796b303c3be67fb11c6</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290662/arch/Linux/installer/openssl-1.0.1h-linux-20140605.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/297168/arch/Linux/installer/openssl-1.0.1h.297168-linux-297168.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1986,16 +2032,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>138997e1a73c65525d45c00f43f08010</string>
+ <string>398743f47578cbb44f5504128780369f</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290662/arch/CYGWIN/installer/openssl-1.0.1h-windows-20140605.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/297168/arch/CYGWIN/installer/openssl-1.0.1h.297168-windows-297168.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.0.1h.295244</string>
+ <string>1.0.1h.297168</string>
</map>
<key>pcre</key>
<map>
@@ -2016,9 +2062,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>6e05137f8d30ef05b3b1c3f39860265d</string>
+ <string>6d2b38897f1adf354b299345d5fc759b</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/295046/arch/Darwin/installer/pcre-8.35.-darwin-295046.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297155/arch/Darwin/installer/pcre-8.35.-darwin-297155.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -2028,9 +2074,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>5e6368d39b95f2c0d5162dac2c17c67f</string>
+ <string>b82817bcc2f63094d9c915d018d0b036</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-pcre-update/rev/290406/arch/Linux/installer/pcre-8.35-linux-20140530.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297155/arch/Linux/installer/pcre-8.35.-linux-297155.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -2040,9 +2086,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9250f74fed826ad1b8700229e964519d</string>
+ <string>96ed836c89a99dfc22f9c16a0d7272d3</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-pcre-update/rev/290406/arch/CYGWIN/installer/pcre-8.35-windows-20140529.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297155/arch/CYGWIN/installer/pcre-8.35.-windows-297155.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -2053,8 +2099,12 @@
</map>
<key>quicktime</key>
<map>
+ <key>copyright</key>
+ <string>2010 Apple</string>
+ <key>description</key>
+ <string>QuickTime 7.3 SDK for Windows</string>
<key>license</key>
- <string>quicktime</string>
+ <string>unknown</string>
<key>license_file</key>
<string>LICENSES/quicktime.txt</string>
<key>name</key>
@@ -2066,19 +2116,21 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>52e49ab6937b09882389da0dbaec17f5</string>
+ <string>3f8b52280cb1eff2d1acd0214bce1b16</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/quicktime-7.3-windows-20110127.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/quicktime_3p-update-quicktime/rev/296445/arch/CYGWIN/installer/quicktime-7.3-windows-296445.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
+ <key>version</key>
+ <string>7.3</string>
</map>
<key>slvoice</key>
<map>
<key>copyright</key>
- <string>2010 Vivox</string>
+ <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
<key>description</key>
<string>Vivox SDK components</string>
<key>license</key>
@@ -2094,9 +2146,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9fd91e50ef6848ef5fe74455cc0042c9</string>
+ <string>ae89da43466a510fbb0a67eb27bb251f</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/294996/arch/Darwin/installer/slvoice-4.6.0009.20030.294996-darwin-294996.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/296971/arch/Darwin/installer/slvoice-4.6.0009.20030.296971-darwin-296971.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -2106,9 +2158,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>957773fff7148ffaca42b1ea4a18d192</string>
+ <string>c66d434b7df05351662c068d3a8d2183</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/270512/arch/Linux/installer/slvoice-4.5.0009.17865-linux-20130216.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/296971/arch/Linux/installer/slvoice-4.5.0006.17020.296971-linux-296971.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -2118,16 +2170,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ce89b881ee24977641d1ecbf8aff6dc7</string>
+ <string>d0ad191e40b5c98748bdd973d6762ade</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/287264/arch/CYGWIN/installer/slvoice-4.6.0009.20030-windows-20140227.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/296971/arch/CYGWIN/installer/slvoice-4.6.0009.20030.296971-windows-296971.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>4.6.0009.20030.294996</string>
+ <string>4.6.0009.20030.296971</string>
</map>
<key>tut</key>
<map>
@@ -2148,9 +2200,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>253519023e73d03fcb3feb2f7a2a8835</string>
+ <string>2f32faa00e600911f838a7d82da5a8db</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/tut_3p-update-tut/rev/295891/arch/Linux/installer/tut-2008.11.30-common-295891.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/tut_3p-update-tut/rev/297257/arch/Linux/installer/tut-2008.11.30-common-297257.tar.bz2</string>
</map>
<key>name</key>
<string>common</string>
@@ -2178,9 +2230,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4d0ef5415076e6593f2533c05c9a87ee</string>
+ <string>ffd3aab8e0c0ff6dadbce49ca2809078</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/295632/arch/Darwin/installer/xmlrpc_epi-0.54.1.295632-darwin-295632.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/297075/arch/Darwin/installer/xmlrpc_epi-0.54.1.297075-darwin-297075.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -2190,9 +2242,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4de9b81e31fb9da981e96a3bdcecabfc</string>
+ <string>30bb26d6cc78c16047fc85a63f48fcdb</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/295272/arch/Linux/installer/xmlrpc_epi-0.54.1.295272-linux-295272.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/297075/arch/Linux/installer/xmlrpc_epi-0.54.1.297075-linux-297075.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -2202,16 +2254,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>5181d1a8f2516928ac064d72acf164a4</string>
+ <string>a7e1a8369a5afd52e1b6fc1f14155033</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc_epi-0.54.1-windows-20110224.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/297075/arch/CYGWIN/installer/xmlrpc_epi-0.54.1.297075-windows-297075.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>0.54.1.295632</string>
+ <string>0.54.1.297075</string>
</map>
<key>zlib</key>
<map>
@@ -2232,9 +2284,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>567f437d22d891c811aa9a70e2b63ad8</string>
+ <string>1a79eeac199c2d94e4ae4e5d0194e25f</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/294883/arch/Darwin/installer/zlib-1.2.8.294883-darwin-294883.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/296881/arch/Darwin/installer/zlib-1.2.8.296881-darwin-296881.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -2244,11 +2296,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ba68e85c1c32c9e1c8bf57c9e21b3d45</string>
+ <string>2eb8e59b6464222dcf4435016ad5f618</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/293925/arch/Linux/installer/zlib-1.2.8.293925-linux-293925.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/296881/arch/Linux/installer/zlib-1.2.8.296881-linux-296881.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -2258,16 +2310,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ab45a628e22a495814e806ce46081806</string>
+ <string>ae420ec6d30411c07aac2502d7bbc0f3</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-zlib-update/rev/290556/arch/CYGWIN/installer/zlib-1.2.8-windows-20140602.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/296881/arch/CYGWIN/installer/zlib-1.2.8.296881-windows-296881.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.2.8.293925</string>
+ <string>1.2.8.296881</string>
</map>
</map>
<key>package_description</key>
@@ -2760,7 +2812,7 @@
<key>windows</key>
<map>
<key>build_directory</key>
- <string>build-vc100</string>
+ <string>build-vc120</string>
<key>configurations</key>
<map>
<key>Debug</key>
@@ -2796,7 +2848,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 10"</string>
+ <string>"Visual Studio 12"</string>
</array>
</map>
<key>name</key>
@@ -2840,7 +2892,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 10"</string>
+ <string>"Visual Studio 12"</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DUSE_KDU=FALSE</string>
</array>
@@ -2881,7 +2933,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 10"</string>
+ <string>"Visual Studio 12"</string>
</array>
</map>
<key>default</key>
@@ -2927,7 +2979,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 10"</string>
+ <string>"Visual Studio 12"</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
@@ -2969,7 +3021,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 10"</string>
+ <string>"Visual Studio 12"</string>
</array>
</map>
<key>name</key>
@@ -3013,7 +3065,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 10"</string>
+ <string>"Visual Studio 12"</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
diff --git a/build.sh b/build.sh
index 11455bff00..4620a52c22 100755
--- a/build.sh
+++ b/build.sh
@@ -32,7 +32,7 @@ build_dir_Linux()
build_dir_CYGWIN()
{
- echo build-vc100
+ echo build-vc120
}
viewer_channel_suffix()
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2d27562e37..1d437a6392 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -314,6 +314,7 @@ Cinder Roxley
BUG-2326
BUG-3863
OPEN-185
+ OPEN-282
STORM-1703
STORM-1948
STORM-1831
diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake
new file mode 100644
index 0000000000..0f574ee39a
--- /dev/null
+++ b/indra/cmake/BuildPackagesInfo.cmake
@@ -0,0 +1,10 @@
+# -*- cmake -*-
+# Construct the version and copyright information based on package data.
+include(Python)
+
+add_custom_command(OUTPUT packages-info.txt
+ COMMENT Generating packages-info.txt for the about box
+ MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
+ DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py > packages-info.txt
+ )
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake
index 8b7f01d20b..798e59a679 100755
--- a/indra/cmake/Havok.cmake
+++ b/indra/cmake/Havok.cmake
@@ -3,7 +3,7 @@
if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
-use_prebuilt_binary(havok-source)
+use_prebuilt_binary(havok_source)
set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source)
list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo)
@@ -68,7 +68,7 @@ foreach(HAVOK_LIB ${HAVOK_LIBS})
endif(DEBUG_PREBUILT)
endif("${havok_${HAVOK_LIB}_extracted}" STREQUAL "" AND EXISTS "${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted")
- if(${CMAKE_BINARY_DIR}/temp/havok-source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0)
+ if(${CMAKE_BINARY_DIR}/temp/havok_source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0)
if(DEBUG_PREBUILT)
MESSAGE(STATUS "Extracting ${HAVOK_LIB}...")
endif(DEBUG_PREBUILT)
@@ -111,7 +111,7 @@ foreach(HAVOK_LIB ${HAVOK_LIBS})
set(havok_${HAVOK_LIB}_extracted 0)
file(WRITE ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted "${havok_${HAVOK_LIB}_extracted}")
- endif(${CMAKE_BINARY_DIR}/temp/havok-source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0)
+ endif(${CMAKE_BINARY_DIR}/temp/havok_source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0)
file(GLOB extracted_debug "${debug_dir}/*.o")
file(GLOB extracted_release "${release_dir}/*.o")
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 309165da7f..2c4bcc91f6 100755
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -101,6 +101,11 @@
#endif
+#if LL_WINDOWS
+# define LL_THREAD_LOCAL __declspec(thread)
+#else
+# define LL_THREAD_LOCAL __thread
+#endif
// Static linking with apr on windows needs to be declared.
#if LL_WINDOWS && !LL_COMMON_LINK_SHARED
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 51c89e1eaf..c3f235c6ee 100755
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -92,13 +92,7 @@ void set_thread_name( DWORD dwThreadID, const char* threadName)
//
//----------------------------------------------------------------------------
-#if LL_DARWIN
-// statically allocated thread local storage not supported in Darwin executable formats
-#elif LL_WINDOWS
-U32 __declspec(thread) sThreadID = 0;
-#elif LL_LINUX
-U32 __thread sThreadID = 0;
-#endif
+U32 LL_THREAD_LOCAL sThreadID = 0;
U32 LLThread::sIDIter = 0;
@@ -115,9 +109,7 @@ LL_COMMON_API void assert_main_thread()
void LLThread::registerThreadID()
{
-#if !LL_DARWIN
sThreadID = ++sIDIter;
-#endif
}
//
@@ -134,9 +126,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
// for now, hard code all LLThreads to report to single master thread recorder, which is known to be running on main thread
threadp->mRecorder = new LLTrace::ThreadRecorder(*LLTrace::get_master_thread_recorder());
-#if !LL_DARWIN
sThreadID = threadp->mID;
-#endif
// Run the user supplied function
threadp->run();
@@ -347,13 +337,7 @@ void LLThread::setQuitting()
// static
U32 LLThread::currentID()
{
-#if LL_DARWIN
- // statically allocated thread local storage not supported in Darwin executable formats
- return (U32)apr_os_thread_current();
-#else
return sThreadID;
-#endif
-
}
// static
diff --git a/indra/llcommon/llthreadlocalstorage.h b/indra/llcommon/llthreadlocalstorage.h
index ec3b52c8cb..3b5786023f 100644
--- a/indra/llcommon/llthreadlocalstorage.h
+++ b/indra/llcommon/llthreadlocalstorage.h
@@ -130,56 +130,19 @@ class LLThreadLocalSingletonPointer
public:
LL_FORCE_INLINE static DERIVED_TYPE* getInstance()
{
-#if LL_DARWIN
- createTLSKey();
- return (DERIVED_TYPE*)pthread_getspecific(sInstanceKey);
-#else
return sInstance;
-#endif
}
static void setInstance(DERIVED_TYPE* instance)
{
-#if LL_DARWIN
- createTLSKey();
- pthread_setspecific(sInstanceKey, (void*)instance);
-#else
sInstance = instance;
-#endif
}
private:
-
-#if LL_WINDOWS
- static __declspec(thread) DERIVED_TYPE* sInstance;
-#elif LL_LINUX
- static __thread DERIVED_TYPE* sInstance;
-#elif LL_DARWIN
- static void TLSError()
- {
- LL_ERRS() << "Could not create thread local storage" << LL_ENDL;
- }
- static void createTLSKey()
- {
- static S32 key_created = pthread_key_create(&sInstanceKey, NULL);
- if (key_created != 0)
- {
- LL_ERRS() << "Could not create thread local storage" << LL_ENDL;
- }
- }
- static pthread_key_t sInstanceKey;
-#endif
+ static LL_THREAD_LOCAL DERIVED_TYPE* sInstance;
};
-#if LL_WINDOWS
-template<typename DERIVED_TYPE>
-__declspec(thread) DERIVED_TYPE* LLThreadLocalSingletonPointer<DERIVED_TYPE>::sInstance = NULL;
-#elif LL_LINUX
-template<typename DERIVED_TYPE>
-__thread DERIVED_TYPE* LLThreadLocalSingletonPointer<DERIVED_TYPE>::sInstance = NULL;
-#elif LL_DARWIN
template<typename DERIVED_TYPE>
-pthread_key_t LLThreadLocalSingletonPointer<DERIVED_TYPE>::sInstanceKey;
-#endif
+LL_THREAD_LOCAL DERIVED_TYPE* LLThreadLocalSingletonPointer<DERIVED_TYPE>::sInstance = NULL;
#endif // LL_LLTHREADLOCALSTORAGE_H
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f5a04a49d0..0905ae7a73 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -5,6 +5,7 @@ project(viewer)
include(00-Common)
include(Boost)
include(BuildVersion)
+include(BuildPackagesInfo)
include(DBusGlib)
include(DirectX)
include(OpenSSL)
@@ -1583,6 +1584,7 @@ set(viewer_APPSETTINGS_FILES
app_settings/viewerart.xml
${CMAKE_SOURCE_DIR}/../etc/message.xml
${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
+ packages-info.txt
)
source_group("App Settings" FILES ${viewer_APPSETTINGS_FILES})
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 66149a4367..7ac3ac2f61 100755
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -123,18 +123,17 @@ BOOL LLFloaterAbout::postBuild()
LLViewerTextEditor *support_widget =
getChild<LLViewerTextEditor>("support_editor", true);
- LLViewerTextEditor *linden_names_widget =
- getChild<LLViewerTextEditor>("linden_names", true);
-
LLViewerTextEditor *contrib_names_widget =
getChild<LLViewerTextEditor>("contrib_names", true);
- LLViewerTextEditor *trans_names_widget =
- getChild<LLViewerTextEditor>("trans_names", true);
+ LLViewerTextEditor *licenses_widget =
+ getChild<LLViewerTextEditor>("licenses_editor", true);
getChild<LLUICtrl>("copy_btn")->setCommitCallback(
boost::bind(&LLFloaterAbout::onClickCopyToClipboard, this));
+ static const LLUIColor about_color = LLUIColorTable::instance().getColor("TextFgReadOnlyColor");
+
if (gAgent.getRegion())
{
// start fetching server release notes URL
@@ -153,24 +152,6 @@ BOOL LLFloaterAbout::postBuild()
support_widget->setEnabled(FALSE);
support_widget->startOfDoc();
- // Get the names of Lindens, added by viewer_manifest.py at build time
- std::string lindens_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"lindens.txt");
- llifstream linden_file;
- std::string lindens;
- linden_file.open(lindens_path); /* Flawfinder: ignore */
- if (linden_file.is_open())
- {
- std::getline(linden_file, lindens); // all names are on a single line
- linden_file.close();
- linden_names_widget->setText(lindens);
- }
- else
- {
- LL_INFOS("AboutInit") << "Could not read lindens file at " << lindens_path << LL_ENDL;
- }
- linden_names_widget->setEnabled(FALSE);
- linden_names_widget->startOfDoc();
-
// Get the names of contributors, extracted from .../doc/contributions.txt by viewer_manifest.py at build time
std::string contributors_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"contributors.txt");
llifstream contrib_file;
@@ -189,23 +170,28 @@ BOOL LLFloaterAbout::postBuild()
contrib_names_widget->setEnabled(FALSE);
contrib_names_widget->startOfDoc();
- // Get the names of translators, extracted from .../doc/tranlations.txt by viewer_manifest.py at build time
- std::string translators_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"translators.txt");
- llifstream trans_file;
- std::string translators;
- trans_file.open(translators_path); /* Flawfinder: ignore */
- if (trans_file.is_open())
+ // Get the Versions and Copyrights, created at build time
+ std::string licenses_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"packages-info.txt");
+ llifstream licenses_file;
+ licenses_file.open(licenses_path); /* Flawfinder: ignore */
+ if (licenses_file.is_open())
{
- std::getline(trans_file, translators); // all names are on a single line
- trans_file.close();
+ std::string license_line;
+ licenses_widget->clear();
+ while ( std::getline(licenses_file, license_line) )
+ {
+ licenses_widget->appendText(license_line+"\n", FALSE,
+ LLStyle::Params() .color(about_color));
+ }
+ licenses_file.close();
}
else
{
- LL_WARNS("AboutInit") << "Could not read translators file at " << translators_path << LL_ENDL;
+ // this case will use the (out of date) hard coded value from the XUI
+ LL_INFOS("AboutInit") << "Could not read licenses file at " << licenses_path << LL_ENDL;
}
- trans_names_widget->setText(translators);
- trans_names_widget->setEnabled(FALSE);
- trans_names_widget->startOfDoc();
+ licenses_widget->setEnabled(FALSE);
+ licenses_widget->startOfDoc();
return TRUE;
}
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index ef2f158a86..60f36770bb 100755
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -51,44 +51,20 @@
name="credits_panel">
<text
follows="top|left|right"
- height="10"
+ height="20"
layout="topleft"
left="5"
name="linden_intro"
top="10"
width="435"
wrap="true">
-Second Life is brought to you by the Lindens:
- </text>
- <text_editor
- enabled="false"
- follows="top|left"
- height="98"
- bg_readonly_color="Transparent"
- left="5"
- text_color="LtGray"
- max_length="65536"
- name="linden_names"
- top_pad="10"
- width="435"
- word_wrap="true">
-Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase, Baker
- </text_editor>
- <text
- follows="top|left"
- height="10"
- layout="topleft"
- left="5"
- name="contrib_intro"
- top_pad="10"
- width="435"
- wrap="true">
+Second Life is brought to you by the Lindens,
with open source contributions from:
</text>
<text_editor
enabled="false"
follows="top|left"
- height="98"
+ height="340"
bg_readonly_color="Transparent"
left="5"
text_color="LtGray"
@@ -99,31 +75,6 @@ with open source contributions from:
word_wrap="true">
Dummy Name replaced at run time
</text_editor>
- <text
- follows="top|left"
- height="10"
- layout="topleft"
- left="5"
- name="trans_intro"
- top_pad="10"
- width="435"
- wrap="true">
-and translations from:
- </text>
- <text_editor
- enabled="false"
- follows="top|left"
- height="98"
- bg_readonly_color="Transparent"
- left="5"
- text_color="LtGray"
- max_length="65536"
- name="trans_names"
- top_pad="10"
- width="435"
- word_wrap="true">
-Dummy Name replaced at run time
- </text_editor>
</panel>
<panel
border="true"
@@ -138,7 +89,7 @@ Dummy Name replaced at run time
left="5"
text_color="LtGray"
max_length="65536"
- name="credits_editor"
+ name="licenses_editor"
top="5"
width="435"
word_wrap="true">
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index a2039b4528..2394dd26b9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -55,7 +55,6 @@ class ViewerManifest(LLManifest):
def construct(self):
super(ViewerManifest, self).construct()
- self.exclude("*.svn*")
self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
@@ -74,26 +73,6 @@ class ViewerManifest(LLManifest):
contributions_path = "../../doc/contributions.txt"
contributor_names = self.extract_names(contributions_path)
self.put_in_file(contributor_names, "contributors.txt", src=contributions_path)
- # include the extracted list of translators
- translations_path = "../../doc/translations.txt"
- translator_names = self.extract_names(translations_path)
- self.put_in_file(translator_names, "translators.txt", src=translations_path)
- # include the list of Lindens (if any)
- # see https://wiki.lindenlab.com/wiki/Generated_Linden_Credits
- linden_names_path = os.getenv("LINDEN_CREDITS")
- if not linden_names_path :
- print "No 'LINDEN_CREDITS' specified in environment, using built-in list"
- else:
- try:
- linden_file = open(linden_names_path,'r')
- except IOError:
- print "No Linden names found at '%s', using built-in list" % linden_names_path
- else:
- # all names should be one line, but the join below also converts to a string
- linden_names = ', '.join(linden_file.readlines())
- self.put_in_file(linden_names, "lindens.txt", src=linden_names_path)
- linden_file.close()
- print "Linden names extracted from '%s'" % linden_names_path
# ... and the entire windlight directory
self.path("windlight")
@@ -107,6 +86,9 @@ class ViewerManifest(LLManifest):
self.path("dictionaries")
self.end_prefix(pkgdir)
+ # include the extracted packages information (see BuildPackagesInfo.cmake)
+ self.path(src=os.path.join(self.args['build'],"packages-info.txt"), dst="packages-info.txt")
+
# CHOP-955: If we have "sourceid" or "viewer_channel" in the
# build process environment, generate it into
# settings_install.xml.
diff --git a/indra/test/lltut.h b/indra/test/lltut.h
index b334fb51e2..9835565bb6 100755
--- a/indra/test/lltut.h
+++ b/indra/test/lltut.h
@@ -75,10 +75,14 @@ namespace tut
// overloads declared above.
// turn off warnings about unused functions from clang for tut package
+#if __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-function"
+#endif
#include <tut/tut.hpp>
+#if __clang__
#pragma clang diagnostic pop
+#endif
// The functions BELOW this point actually consume tut.hpp functionality.
namespace tut
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
new file mode 100755
index 0000000000..1432cdaebe
--- /dev/null
+++ b/scripts/packages-formatter.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+"""\
+This module formats the package version and copyright information for the
+viewer and its dependent packages.
+
+$LicenseInfo:firstyear=2014&license=viewerlgpl$
+Second Life Viewer Source Code
+Copyright (C) 2014, Linden Research, Inc.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation;
+version 2.1 of the License only.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+$/LicenseInfo$
+"""
+import os
+import sys
+import re
+import subprocess
+
+autobuild=os.getenv('AUTOBUILD',
+ 'autobuild' if not ( sys.platform == 'win32' or sys.platform == 'cygwin')
+ else 'autobuild.cmd')
+
+pkg_line=re.compile('^([\w-]+):\s+(.*)$')
+
+version={}
+versions=subprocess.Popen([autobuild, 'install', '--versions'],
+ stdin=None, stdout=subprocess.PIPE, universal_newlines=True).stdout
+for line in versions:
+ pkg_info = pkg_line.match(line)
+ if pkg_info:
+ pkg = pkg_info.group(1)
+ if pkg not in version:
+ version[pkg] = pkg_info.group(2).strip()
+ else:
+ sys.exit("Duplicate version for %s" % pkg)
+ else:
+ sys.exit("Unrecognized --versions output: %s" % line)
+
+copyright={}
+copyrights=subprocess.Popen([autobuild, 'install', '--copyrights'],
+ stdin=None, stdout=subprocess.PIPE, universal_newlines=True).stdout
+viewer_copyright = copyrights.readline() # first line is the copyright for the viewer itself
+for line in copyrights:
+ pkg_info = pkg_line.match(line)
+ if pkg_info:
+ pkg = pkg_info.group(1)
+ if pkg not in copyright:
+ copyright[pkg] = pkg_info.group(2).strip()
+ else:
+ sys.exit("Duplicate copyright for %s" % pkg)
+ else:
+ sys.exit("Unrecognized --copyrights output: %s" % line)
+
+print viewer_copyright
+for pkg in sorted(version):
+ print ': '.join([pkg, version[pkg]])
+ if pkg in copyright:
+ print copyright[pkg]
+ else:
+ sys.exit("No copyright for %s" % pkg)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:19:28 +0000