diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
| commit | d82d5c357a98745d265a839dd0242ec8a4994e86 (patch) | |
| tree | ac61ed5c7e676e438a80bedd3f14f41fa7f35975 /autobuild.xml | |
| parent | 56101002a460ecd9bb7a264d55b6f8ecb9a348a0 (diff) | |
| parent | bd9add8fc77d7f39cb7c81972f72adbc3e6b5464 (diff) | |
Merge commit 'bd9add8fc7' into marchcat/c-develop
# Conflicts:
# autobuild.xml
# indra/llui/llmodaldialog.cpp
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/tests/llviewerassetstats_test.cpp
Diffstat (limited to 'autobuild.xml')
| -rw-r--r-- | autobuild.xml | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/autobuild.xml b/autobuild.xml index 70d7216486..c4a7a75b2d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2401,23 +2401,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> </map> <key>threejs</key> <map> + <key>copyright</key> + <string>Copyright © 2010-2021 three.js authors</string> + <key>license</key> + <string>MIT</string> + <key>license_file</key> + <string>LICENSES/THREEJS_LICENSE.txt</string> + <key>name</key> + <string>threejs</string> <key>platforms</key> <map> - <key>darwin64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>cfed00d8ea7265c035c2d86a234b28efb0b23756</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-b8f6746/threejs-0.132.2-darwin64-b8f6746.tar.zst</string> - </map> - <key>name</key> - <string>darwin64</string> - </map> - <key>linux64</key> + <key>common</key> <map> <key>archive</key> <map> @@ -2429,33 +2423,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <string>https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-5da28d9/threejs-0.132.2-common-8454371083.tar.zst</string> </map> <key>name</key> - <string>linux64</string> - </map> - <key>windows64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>4141710fccbd1ea2b3b53d00e189bdfa2ee9d441</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-b8f6746/threejs-0.132.2-windows64-b8f6746.tar.zst</string> - </map> - <key>name</key> - <string>windows64</string> + <string>common</string> </map> </map> - <key>license</key> - <string>MIT</string> - <key>license_file</key> - <string>LICENSES/THREEJS_LICENSE.txt</string> - <key>copyright</key> - <string>Copyright © 2010-2021 three.js authors</string> <key>version</key> <string>0.132.2</string> - <key>name</key> - <string>threejs</string> </map> <key>tinygltf</key> <map> |