Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh

Browse Source
This commit is contained in:
Damian Zhaoying
2019-03-31 02:29:06 -03:00
parent 1644ee6fad c8a9efe5c8
commit 9b29fd1385
4 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
autobuild.xml
View File

@@ -106,11 +106,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>76186b09770cab66dba6586cb1d2123f</string>
<string>d0cf074a2c95a65b8833350dad77c0ae</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/apr_suite-1.5.2-windows-201603261507.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/apr_suite-1.5.2-windows-201703090634.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -278,11 +278,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>d606e5c39d13f2c23d23ac498520cbac</string>
<string>ae0998e5d108c77c5cea2a68ad928151</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/boost-1.60.0-windows-201601152308.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/boost-1.63.0-windows-201703281813.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -362,11 +362,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>90a37cec15019bff53a165b90f0180a7</string>
<string>60bd2dbac5559141e05be6c424cf9cd0</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/colladadom-2.3-windows-201601152346.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/colladadom-2.3-windows-201703281922.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -448,11 +448,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f20491b59795d311cf8d730556cd141e</string>
<string>da5be630ca350a7ed4c0e99250451d41</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/curl-7.48.0-windows-201603231720.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/curl-7.56.1-windows-201711241310.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -610,11 +610,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>454170939e4d1ba07060b73d6f81b9fc</string>
<string>f10218f7c28d63a3d9f1fb683d116bf8</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/expat-2.1.1-windows-201603261409.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/expat-2.2.0-windows-201703090626.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -698,11 +698,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>fe50f650c97e6350bedfd90102d3321f</string>
<string>b23a30967666da49346983658ed50e92</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/windows/lib/fmodstudio-1.08.04-windows-201605291158.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib/fmodstudio-1.10.00-windows-201709290225.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -874,11 +874,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>e5be5197f12f9ca8078ba9ce4f1bce10</string>
<string>bdbfc3b58cfc2f125881be748d092645</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/freetype-2.6.3-windows-201603011805.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/freetype-2.8.0-windows-201710192344.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1024,11 +1024,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>05134ab3cf05fbfb4bed996b53a0d472</string>
<string>37035aad7d066dfe6f26dc009aa9dcea</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/glod-1.0pre4-windows-201601151027.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/glod-1.0pre4-windows-201703090622.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1110,11 +1110,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>19147e19b5cfaaaeb83ff1d9025c06df</string>
<string>fa7f683ba4ddd7db777c78c8213d2e46</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/google_breakpad-9e60a27-windows-201601151025.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/google_breakpad-7398ce15b79da-windows-201703090621.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1170,7 +1170,7 @@
<key>hash</key>
<string>e81d9e4526ceac49f1532d6518085985</string>
<key>url</key>
<string>https://bitbucket.org/alchemyviewer/publiclibs/downloads/gperftools-2.1-windows-20140120.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib/gperftools-2.1-windows-20140120.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1324,11 +1324,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>581db1bb70a7f6b9a6718121d22597a9</string>
<string>a9a7af50c5c1b5319dfea82cd09fdd84</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/jpeglib-1.4.2-windows-201601151022.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/jpeglib-1.5.1-windows-201703090615.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1410,11 +1410,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>440a81e502be320c789337653ad1af7c</string>
<string>cfce0b7d65b28b34fd0643cbcf7b0bac</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/libhunspell-1.3.3-windows-201601151018.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/libhunspell-1.6.0-windows-201703090619.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1516,11 +1516,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>1bed832715f068e3363ba90a0415092f</string>
<string>e2927116641e2c74ada092bfb6b49a8d</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/libndofdev-0.1-windows-201601151016.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/libndofdev-0.1-windows-201703090613.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1634,11 +1634,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5e7b3ea13fec60f6c9a8965a390cfbd5</string>
<string>9aad0afaf2c1895224454c1dc433f481</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/libpng-1.6.21-windows-201603011800.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/libpng-1.6.34-windows-201710172201.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1720,11 +1720,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>6f1e3fcceab669df5c3d1c66821b2f24</string>
<string>a3f7c3421e9e4921dda3558c3b36dc59</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/libxml2-2.9.3-windows-201601151053.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/libxml2-2.9.4-windows-201703090740.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2062,11 +2062,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>e8c42c8ee03d570fa5e7fb88e7e1bc92</string>
<string>41d090321853ea941c5ca57ba0d471d0</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/ogg_vorbis-1.3.2-1.3.5-windows-201601151012.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/ogg_vorbis-1.3.2-1.3.5-windows-201703090612.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2236,11 +2236,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>91b9fa570258f627a9265452d9e65231</string>
<string>0d25e1794f5d86b675484bf5eda799e4</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/openssl-1.0.2g-windows-201603011823.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/openssl-1.1.0g-windows-201711200028.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2354,11 +2354,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>47a3316dae47cc4e7c1ea7b74ba8dd1e</string>
<string>5a78539626b5f23522d0b466247f48b4</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/vivox_3p-slvoice/rev/302004/arch/CYGWIN/installer/slvoice-4.6.0017.22050.302004-windows-302004.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/21422/157291/slvoice-4.9.0002.30313.517593-windows-517593.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2590,11 +2590,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>7a619778a2ea5c3113549529dd4f7288</string>
<string>4cd5d80362fef95fe486b5bc1c373174</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/xmlrpc_epi-0.54.2-windows-201603261505.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/xmlrpc_epi-0.54.2-windows-201703090632.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2676,11 +2676,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a26a7a9d550dc6988528e2e70bb5e85b</string>
<string>75651f8b2fa45545461f73ba583180bb</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib-vc14/zlib-1.2.8-windows-201601150945.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc141/zlib-1.2.11-windows-201703090604.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

2
indra/cmake/00-Common.cmake
View File

@@ -108,7 +108,7 @@ if (WINDOWS)
endif (USE_LTO)
if (WORD_SIZE EQUAL 32)
add_compile_options(/arch:SSE3)
add_compile_options(/arch:SSE2)
endif (WORD_SIZE EQUAL 32)
if (NOT DISABLE_FATAL_WARNINGS)

4
indra/cmake/Copy3rdPartyLibs.cmake
View File

@@ -20,11 +20,9 @@ if(WINDOWS)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
SLVoice.exe
ca-bundle.crt
libsndfile-1.dll
vivoxsdk.dll
ortp.dll
vivoxoal.dll
vivoxplatform.dll
)
#*******************************

4
indra/newview/llslurl.cpp
View File

@@ -61,8 +61,8 @@ const std::string MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/
const std::string SYSTEM_GRID_APP_SLURL_BASE = "secondlife:///app";
const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
const char* DEFAULT_SLURL_BASE = "https://%s/region/";
const char* DEFAULT_APP_SLURL_BASE = "x-grid-location-info://%s/app";
const char* DEFAULT_SLURL_BASE = "x-grid-info://%s/region/";
const char* DEFAULT_APP_SLURL_BASE = "x-grid-info://%s/app";
#define MAINGRID "secondlife"
// resolve a simstring from a slurl