Merge Firestorm LGPL
Ansariel
commit
d30bb9b7c4
323
autobuild.xml
323
autobuild.xml
|
|
@ -222,9 +222,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8a19ebfac2b8ad690ef406ae55d13fe3</string>
|
||||
<string>2dd97d8bd012be4cdc58f550395feb7d</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux-201605221913-r44.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux-180871815.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -234,9 +234,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>2566e373b89a2e4f8e93a78948deda10</string>
|
||||
<string>608dfd27f7aed9d57cf1f581c995b680</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux-x64-201509062227-r43.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux64-180841947.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -288,9 +288,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>1aa2e5355bb9df09f9196d14a72b6705</string>
|
||||
<string>161e07b37e2f30da004a0d72d5075ad7</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-apr/rev/314241/arch/Linux/installer/apr_suite-1.4.5.314241-linux-314241.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/apr_suite-1.4.5.180871344-linux-180871344.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -300,9 +300,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e640dcbc376eec6f3a942b4625d92d8e</string>
|
||||
<string>5c3c29851edd837d5f9518618c4a303b</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/apr_suite-1.4.5.201505150215-r92-linux-x64-201505150215-r92.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/apr_suite-1.4.5.180841559-linux64-180841559.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -378,9 +378,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5ff95c28897a7bb4da93bd4f5b3d9d06</string>
|
||||
<string>32828f4ee3e5a45ed31e37eb7dd6367c</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/boost-1.57-linux-201505061539-r135.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/boost-1.57-linux-180871354.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -390,9 +390,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e86cc6e004d39d7210f708b39bed77a9</string>
|
||||
<string>b1d3daab689c5a8c8869715c5111d38e</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/boost-1.57-linux-x64-201505150230-r138.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/boost-1.57-linux64-180841628.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -496,9 +496,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>f73cbdc220605119cf5f1b0c42d3bb9c</string>
|
||||
<string>d83896f28716f34b7b49d61a23283c4c</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/colladadom-2.3.201505061613-r94-linux-201505061613-r94.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/colladadom-2.3.180871403-linux-180871403.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -508,9 +508,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>0f3447ce6fddba79b54cb5959e95f330</string>
|
||||
<string>91a522a7bf0e8d66d2941c76dc28a261</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/colladadom-2.3.201505150238-r95-linux-x64-201505150238-r95.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/colladadom-2.3.180841822-linux64-180841822.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -586,9 +586,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>9430c08954c00736117099046694e1b1</string>
|
||||
<string>cade3843dfd7985f008cc8161daaefb0</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-curl/rev/314230/arch/Linux/installer/curl-7.47.0.314230-linux-314230.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/curl-7.54.1.180871811-linux-180871811.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -598,9 +598,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>630a2ddf43bba6e5b6e171dc68921dcb</string>
|
||||
<string>51d9ce98279709854b0be5d0f450ba63</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8663/36142/curl-7.54.1.508652-linux64-508652.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/curl-7.54.1.180841943-linux64-180841943.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -684,9 +684,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>6d676abd9ad8d2883b855dbe397d9034</string>
|
||||
<string>9591dcb7efce2a770d77e907705e1492</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-dbus-glib/rev/314266/arch/Linux/installer/dbus_glib-0.76-linux-314266.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/dbus_glib-0.76-linux-180871236.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -696,9 +696,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>7ee7b9aed3c0c8c09e7bf26bba7af8e1</string>
|
||||
<string>5a685a65a7066937ef580dcd5a90f9dc</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-dbus-glib/rev/314266/arch/Linux/installer/dbus_glib-0.76-linux64-314266.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/dbus_glib-0.76-linux64-180841549.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -768,9 +768,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>efc92b20a8170ab4f4d3f88c03c6cb9b</string>
|
||||
<string>bd0f62a03d846332adf07997e307cde6</string>
|
||||
<key>url</key>
|
||||
<string>http://192.168.1.115/dev/pkg/dullahan-1.1.651_3.2987.1591.gd3e47f5-linux-171011511.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1080_3.3325.1750.gaabe4c4-linux-180871715.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -780,9 +780,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>331c13dfd261f867884308f15d9952bc</string>
|
||||
<string>6dded97d697c5ac9e4bd33c9ca8e3f9e</string>
|
||||
<key>url</key>
|
||||
<string>http://192.168.1.115/dev/pkg/dullahan-1.1.651_3.2987.1591.gd3e47f5-linux64-171011518.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1080_3.3325.1750.gaabe4c4-linux64-180861548.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -882,9 +882,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>387c90b9bb5ec412587fbe7a56261dd1</string>
|
||||
<string>b20e813b55488e43df5c197f1efd165c</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-expat/rev/314211/arch/Linux/installer/expat-2.1.1.314211-linux-314211.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/expat-2.1.1.180871203-linux-180871203.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -894,9 +894,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5e1f025d1cebd12db542080aa755257f</string>
|
||||
<string>bbcfe77b920fb7f00c7f2a494ffc6c43</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/380/943/expat-2.1.1.500375-linux64-500375.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/expat-2.1.1.180841547-linux64-180841547.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -962,11 +962,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>eccdcb4a1e96bb829284d01255f4f913</string>
|
||||
<string>a379240b46b13b2b9e858baa79d1a6ab</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/fmodstudio-1.10.02-linux-201801091647.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/fmodstudio-1.10.04-linux-180891813.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -976,11 +976,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8787b777a49d41ccbb3cbd6c4a1d768d</string>
|
||||
<string>e0b59ec3b5549b9a0f9caf8c7116af4e</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/fmodstudio-1.10.02-linux-x64-201801091648.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/fmodstudio-1.10.04-linux64-180891838.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1088,9 +1088,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>a20a3d0ab7fc3401bc2ca81e9309f630</string>
|
||||
<string>f7a2a70417ab9d2f999f80604cb4fa48</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-fontconfig/rev/314281/arch/Linux/installer/fontconfig-2.11.0-linux-314281.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/fontconfig-2.11.0-linux-180871443.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1100,9 +1100,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e2419d56960c160670051fbb055fb729</string>
|
||||
<string>5818ed2d9b29bad00878f3e26b09b7f9</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-fontconfig/rev/314281/arch/Linux/installer/fontconfig-2.11.0-linux64-314281.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/fontconfig-2.11.0-linux64-180841833.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1154,9 +1154,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>1b401394106cedc86926bd488f5aa45e</string>
|
||||
<string>ced1bc8b28a2e87093b364c2b6d8cb9c</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-freetype/rev/314215/arch/Linux/installer/freetype-2.4.4.314215-linux-314215.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/freetype-2.4.4.180871412-linux-180871412.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1166,9 +1166,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>b30634f1a6ee2b4940eee06267a607df</string>
|
||||
<string>0dab99c682433145aa8f5e26d8940afd</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/freetype-2.3.9.201505150242-r61-linux-x64-201505150242-r61.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/freetype-2.4.4.180841832-linux64-180841832.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1220,9 +1220,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>baf1fd13e1fe6aef586200fc87a70f53</string>
|
||||
<string>da432b959ccd920adca1030ad7f1b6cf</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-glext/rev/314200/arch/Linux/installer/glext-68-linux-314200.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/glext-68-linux-180871251.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1232,9 +1232,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5f3c9d61b620f949b199ebd8885218ed</string>
|
||||
<string>12b2d643a013be8297bbbe37743abe94</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-glext/rev/314200/arch/Linux/installer/glext-68-linux64-314200.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/glext-68-linux64-180841554.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1342,11 +1342,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>f62e7cff14feb646babaa19b7ea14ed3</string>
|
||||
<string>4aa53f9774195899efb9d14a0f6c4748</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/glod-1.0pre3.201704302344-linux-201704302344.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/glod-1.0pre3.180872225-linux-180872225.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1356,9 +1356,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>fea16abf8c2b7f38fc33a2142bfbfe18</string>
|
||||
<string>c742c8b3903aadd79c3a6f3d3c09986d</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/glod-1.0pre3.201704302331-linux64-201704302331.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/glod-1.0pre3.180842253-linux64-180842253.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1436,9 +1436,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>352e673897e8f36f8470150b8ace6ce9</string>
|
||||
<string>95860763e872e984e4215b0fa22d40b8</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-google-breakpad/rev/314225/arch/Linux/installer/google_breakpad-1413.314225-linux-314225.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/google_breakpad-1413.180871249-linux-180871249.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1448,9 +1448,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>f8df27382e6afeee5408e85c010a6c86</string>
|
||||
<string>aa4a74b0c5794034797f22d4bdc57a0d</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/google_breakpad-1413.201505150223-r95-linux-x64-201505150223-r95.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/google_breakpad-1413.180841553-linux64-180841553.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1526,9 +1526,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>ad51f68702f25ba245fff312c50c8876</string>
|
||||
<string>5bc5ddeb97b8498d5141e27092161323</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-googlemock/rev/317828/arch/Linux/installer/googlemock-1.7.0.317828-linux-317828.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/googlemock-1.7.0.180871704-linux-180871704.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1538,9 +1538,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>0f606bf01f933f00edeb9bf9a2530930</string>
|
||||
<string>f879f518ea207cecf13943d58b57b515</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/918/2056/googlemock-1.7.0.500908-linux64-500908.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/googlemock-1.7.0.180841921-linux64-180841921.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1590,9 +1590,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5017b3e95d2c6f47bb111c3f9c075522</string>
|
||||
<string>904540d91ea7d577c7bcbb679621f013</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-gstreamer/rev/314267/arch/Linux/installer/gstreamer-0.10.6.314267-linux-314267.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/gstreamer-0.10.6.180871246-linux-180871246.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1602,9 +1602,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>7c9d7cc88add7831a6afeedc20cad2fe</string>
|
||||
<string>86a358f1b5a2c2baf68444b2bfc5bb32</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-gstreamer/rev/314267/arch/Linux/installer/gstreamer-0.10.6.314267-linux64-314267.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/gstreamer-0.10.6.180841551-linux64-180841551.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1630,9 +1630,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8cd64b4c5d7f02c5ad87051861108749</string>
|
||||
<string>fb047d496c32cc3b9f99793ee6ebb1e3</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/gtk_atk_pango_glib-2.0-linux-201608031222.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/gtk_atk_pango_glib-2.1-linux-180871647.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1642,16 +1642,16 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>61a10409052c7f77cbfe30b7a8cd7c0b</string>
|
||||
<string>d918d894430c1d1d869b9f2e06570c65</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/gtk_atk_pango_glib-2.0-linux-x64-201505151700-r5.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/gtk_atk_pango_glib-2.1-linux64-180841902.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>0.1</string>
|
||||
<string>2.1</string>
|
||||
</map>
|
||||
<key>havok-source</key>
|
||||
<map>
|
||||
|
|
@ -1816,9 +1816,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>32560d3200da72fea2922371fcef25f5</string>
|
||||
<string>a7039c9a9c4461c5f85542f068dc09e5</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-jpeglib/rev/314202/arch/Linux/installer/jpeglib-8c.314202-linux-314202.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/jpeglib-8c.180871203-linux-180871203.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1828,9 +1828,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8b36861396af4a31668f673aebd4b1d8</string>
|
||||
<string>324bb9deb00d256a12f8cbf686f413f0</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/jpeglib-8c.201505150200-r27-linux-x64-201505150200-r27.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/jpeglib-8c.180841548-linux64-180841548.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1906,9 +1906,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>9d5d9fec28cbbb1651b95728173f8af7</string>
|
||||
<string>da45220ec6fcf945f6ca1f11bc7606cf</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-jsoncpp/rev/314229/arch/Linux/installer/jsoncpp-0.5.0.314229-linux-314229.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/jsoncpp-0.5.0.180872045-linux-180872045.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1918,9 +1918,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e10077e94fa6916b6da001fc52e15ed6</string>
|
||||
<string>724850830e01cdb6afb4eed9ce2ec6c5</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/jsoncpp-0.5.0.201508041908-r34-linux-x64-201508041908-r34.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/jsoncpp-0.5.0.180841554-linux64-180841554.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1972,9 +1972,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>75991f598df209713faf94b4a1cb1a89</string>
|
||||
<string>814bec3fa5045a18dce2bc4ce78b585d</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/kdu-7.A.3-darwin-180711129.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/kdu-7.A.4-darwin-180792321.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
|
|
@ -1984,9 +1984,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>75991f598df209713faf94b4a1cb1a89</string>
|
||||
<string>814bec3fa5045a18dce2bc4ce78b585d</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/kdu-7.A.3-darwin-180711129.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/kdu-7.A.4-darwin-180792321.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
|
|
@ -1996,9 +1996,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>1c4e11f6ca7cdc2a3e5158eda7a432be</string>
|
||||
<string>fa8a0db7f4900663f5d58eaac2b782b5</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/kdu-7.9.1-linux-201703182157.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/kdu-7.A.4-linux-180892203.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2008,9 +2008,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>1c4e11f6ca7cdc2a3e5158eda7a432be</string>
|
||||
<string>fa8a0db7f4900663f5d58eaac2b782b5</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/kdu-7.9.1-linux-201703182157.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/kdu-7.A.4-linux-180892203.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -2086,9 +2086,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>0d8009c3b6c1eb510593476dd1d821b5</string>
|
||||
<string>77996d95cf2f072f4f277a2aaff20456</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-hunspell/rev/314217/arch/Linux/installer/libhunspell-1.3.2.314217-linux-314217.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libhunspell-1.3.2.180871248-linux-180871248.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2098,9 +2098,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>7341037efcf156ad7aa6ba67ab0413c5</string>
|
||||
<string>6555f040c686d8c1dec8e6264c2d3672</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/libhunspell-1.3.2.201505150222-r21-linux-x64-201505150222-r21.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libhunspell-1.3.2.180841552-linux64-180841552.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -2242,9 +2242,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>0758f3cb4c02ebab61854b811b0894e9</string>
|
||||
<string>31754947447ec98374b3bf92e29cf68a</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-libpng/rev/314214/arch/Linux/installer/libpng-1.6.8.314214-linux-314214.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libpng-1.6.8.180871343-linux-180871343.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2254,9 +2254,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>96cccc9c256107ff8425e15647957f17</string>
|
||||
<string>83ae55031f81dace9dcf688cc5510010</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/libpng-1.6.8.201505150228-r52-linux-x64-201505150228-r52.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libpng-1.6.8.180841558-linux64-180841558.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -2308,9 +2308,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>a2eaf9515cd129f3e21a08e92689006b</string>
|
||||
<string>1b1d83df165c947bea5c60c460277f93</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-libuuid/rev/314269/arch/Linux/installer/libuuid-1.6.2-linux-314269.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libuuid-1.6.2-linux-180871203.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2320,9 +2320,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>6eca8418f134d2f4d97de89a33773be3</string>
|
||||
<string>f3cc32c84b99f1277370ce88a0faf40e</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/libuuid-1.6.2-linux-x64-201505150200-r8.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libuuid-1.6.2-linux64-180841554.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -2374,9 +2374,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>6954173a141d928f2614076577d952de</string>
|
||||
<string>b4e676d3d583264f006432510727aa05</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-libxml/rev/314197/arch/Linux/installer/libxml2-2.9.1.314197-linux-314197.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libxml2-2.9.4.180871340-linux-180871340.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2386,9 +2386,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>ba36cdab49fd5f3f5158cd6719a84a90</string>
|
||||
<string>0bc56fa68f59537486c75b04646d65a9</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/libxml2-2.9.1.201505150226-r42-linux-x64-201505150226-r42.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/libxml2-2.9.4.180841555-linux64-180841555.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -2694,9 +2694,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>079c1a1bdb3ce1cda8ce3d7f75eeced3</string>
|
||||
<string>24c50d563fe8ff10ca819088ffbef7a6</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9258/41585/nghttp2-1.25.0.509246-linux-509246.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/nghttp2-1.25.0.180871240-linux-180871240.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2706,9 +2706,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>c3c5ff7d2f7ac1143ef8d888192d4a53</string>
|
||||
<string>b460d5bac2d20b38cb73b54d0ab1b6e3</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9257/41579/nghttp2-1.25.0.509246-linux64-509246.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/nghttp2-1.25.0.180841549-linux64-180841549.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -2828,9 +2828,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5c9d94dce4551b19790057766ff939ea</string>
|
||||
<string>ee185657aed3a7fcabcd9a1335a6050b</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-oggvorbis/rev/314224/arch/Linux/installer/ogg_vorbis-1.2.2-1.3.2.314224-linux-314224.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/ogg_vorbis-1.2.2-1.3.2.180871245-linux-180871245.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2840,9 +2840,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>a237c81b2c5fa3926ce04586568cce74</string>
|
||||
<string>ec5fd10d3a504e528b61d339522ca0f9</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/ogg_vorbis-1.2.2-1.3.2.201505150221-r32-linux-x64-201505150221-r32.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/ogg_vorbis-1.2.2-1.3.2.180841550-linux64-180841550.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -2894,9 +2894,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>a0f11d381e6daf2b4352461a75c53e89</string>
|
||||
<string>86cb59b79ce0aafe28d4055a17d1f748</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.8-linux-201605222023-r13.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.3.180871824-linux-180871824.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2906,16 +2906,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>587567ef04c06b9bf746e3491dbcc556</string>
|
||||
<string>4df349abfc942fb8e674244d1bd0a515</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.8-linux-x64-201602152224-r18.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.3.180841957-linux64-180841957.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>0.3</string>
|
||||
<string>0.3.180841957</string>
|
||||
</map>
|
||||
<key>openal</key>
|
||||
<map>
|
||||
|
|
@ -2936,11 +2936,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>24b91eda3831a51c7774644016c4cb09</string>
|
||||
<string>cc0f030e6f4a78e3afd5269165c056b4</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-openal/rev/314223/arch/Linux/installer/openal-1.12.854-1.1.0.314223-linux-314223.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/openal-1.12.854-1.1.0.180871246-linux-180871246.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -2950,9 +2950,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>9ccf2c9046edd73854fc084919f507b2</string>
|
||||
<string>4f36ae378593240701fd4453bd6074c8</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/openal-1.12.854-1.1.0.201505150222-r25-linux-x64-201505150222-r25.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/openal-1.12.854-1.1.0.180841552-linux64-180841552.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3030,9 +3030,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>675c283030879d3d9c49082bfa2192eb</string>
|
||||
<string>cc1aca5688b00878ae94a0ad71cb4f35</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openjpeg_3p-update-openjpeg/rev/297018/arch/Linux/installer/openjpeg-1.4.297018-linux-297018.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/openjpeg-1.5.1.180871249-linux-180871249.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -3042,9 +3042,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8b36861396af4a31668f673aebd4b1d8</string>
|
||||
<string>6098e555296583336b02f1a78b41b93a</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/jpeglib-8c.201505150200-r27-linux-x64-201505150200-r27.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/openjpeg-1.5.1.180841553-linux64-180841553.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3120,9 +3120,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>f46a601d60b7dbcfde32afc0cb64453e</string>
|
||||
<string>343f6ace63617546704c4aad9b432312</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-openssl/rev/314227/arch/Linux/installer/openssl-1.0.1h.314227-linux-314227.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/openssl-1.0.2l.180871731-linux-180871731.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -3132,9 +3132,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>d50ccfbf0c1d249392919e2c46ad8d5c</string>
|
||||
<string>7920fce93d9addf63a420d86f91c5749</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8339/33495/openssl-1.0.2l.508328-linux64-508328.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/openssl-1.0.2l.180841936-linux64-180841936.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3210,9 +3210,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>24a119b18e63017ad932ad54df8161bc</string>
|
||||
<string>cf1c53b27e5889c7c5963ed06ab23cb2</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-pcre/rev/314136/arch/Linux/installer/pcre-8.35.314136-linux-314136.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/pcre-8.35.180871234-linux-180871234.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -3222,9 +3222,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>0f058ca2176e7d02d51e54c66a96f336</string>
|
||||
<string>348a6111dede9a4ddfc51049c2ff186f</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/908/2010/pcre-8.35.500898-linux64-500898.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/pcre-8.35.180841548-linux64-180841548.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3288,9 +3288,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>a92f2235991871c3d601a73cfef9b2af</string>
|
||||
<string>9fe44ba82ee05363fdfa4c1b9f2ec360</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4105/11530/requests-1.0-linux64-504094.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/requests-2.18.1-linux64-180841555.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3466,9 +3466,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>dddfc8dea540801f93ba0382cb1e3685</string>
|
||||
<string>6573a190dbdef9b23235beb9b1219bef</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/uriparser_3p-update-uriparser/rev/299435/arch/Linux/installer/uriparser-0.8.0.1-linux-299435.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-180871244.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -3478,9 +3478,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e67a27e13e546cbb13fad2665a1896b7</string>
|
||||
<string>df570f2b9c0087438604a8ba4dc37a85</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-x64-201502251606-r15.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux64-180841550.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3574,13 +3574,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8c7f32f85850248809ae811ba8e47d81</string>
|
||||
<string>b7167025f54c044abee21b48476ad4f2</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3428/8686/viewer_manager-1.0-linux-503417.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/viewer_manager-1.0.180871935-linux-180871935.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
</map>
|
||||
<key>linux64</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>129b80dd47b53bfa02fc21ab1eb1901c</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/viewer_manager-1.0.180861311-linux64-180861311.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
</map>
|
||||
<key>windows</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
|
|
@ -3720,9 +3732,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>b63f828e798287d475991134cdcfbca3</string>
|
||||
<string>0f318372198fb34b3a59b4aa03c40ac7</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-xmlrpc-epi/rev/314240/arch/Linux/installer/xmlrpc_epi-0.54.1.314240-linux-314240.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/xmlrpc_epi-0.54.1.180871731-linux-180871731.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -3732,9 +3744,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e2e5b6aba70c8fbc09ef7f12e8fb3937</string>
|
||||
<string>f810193590cae9b35a1c77b6c72bfb01</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/xmlrpc_epi-0.54.1.201505150223-r63-linux-x64-201505150223-r63.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/xmlrpc_epi-0.54.1.180841935-linux64-180841935.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3810,11 +3822,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>98a8c775c581ca80bb559e8b4e8eaae7</string>
|
||||
<string>ee84398d540324533332a048f77bf08a</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-zlib/rev/314131/arch/Linux/installer/zlib-1.2.8.314131-linux-314131.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/zlib-1.2.8.180871259-linux-180871259.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -3824,9 +3836,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>c165dcf9bd8a27c0382137c33e1a3854</string>
|
||||
<string>15a645809cb2f14074f22e7848bb42cf</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/zlib-1.2.8.201505150226-r125-linux-x64-201505150226-r125.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/zlib-1.2.8.180841547-linux64-180841547.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -3981,7 +3993,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>name</key>
|
||||
<string>Doxygen</string>
|
||||
</map>
|
||||
|
||||
<key>ReleaseFS</key>
|
||||
<map>
|
||||
<key>configure</key>
|
||||
|
|
@ -4088,7 +4099,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>name</key>
|
||||
<string>RelWithDebInfoFS_open</string>
|
||||
</map>
|
||||
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>common</string>
|
||||
|
|
@ -4147,10 +4157,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<string>Xcode</string>
|
||||
</array>
|
||||
</map>
|
||||
<!--
|
||||
<key>default</key>
|
||||
<string>True</string>
|
||||
-->
|
||||
<key>name</key>
|
||||
<string>RelWithDebInfo</string>
|
||||
</map>
|
||||
|
|
@ -4233,7 +4239,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>name</key>
|
||||
<string>ReleaseOS</string>
|
||||
</map>
|
||||
|
||||
<key>RelWithDebInfoFS</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
@ -4318,7 +4323,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>name</key>
|
||||
<string>ReleaseFS</string>
|
||||
</map>
|
||||
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
|
|
@ -4375,10 +4379,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<string>Unix Makefiles</string>
|
||||
</array>
|
||||
</map>
|
||||
<!--
|
||||
<key>default</key>
|
||||
<string>True</string>
|
||||
-->
|
||||
<key>name</key>
|
||||
<string>RelWithDebInfo</string>
|
||||
</map>
|
||||
|
|
@ -4603,10 +4603,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
|
||||
</array>
|
||||
</map>
|
||||
<!--
|
||||
<key>default</key>
|
||||
<string>True</string>
|
||||
-->
|
||||
<key>name</key>
|
||||
<string>RelWithDebInfo</string>
|
||||
</map>
|
||||
|
|
@ -4719,7 +4715,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>name</key>
|
||||
<string>ReleaseOS</string>
|
||||
</map>
|
||||
|
||||
<key>RelWithDebInfoFS</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
|
|
@ -4938,8 +4933,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>name</key>
|
||||
<string>ReleaseFS_open</string>
|
||||
</map>
|
||||
|
||||
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ if (LINUX)
|
|||
if ( ${FORTIFY_SOURCE_RES} EQUAL 0 )
|
||||
add_definitions(-D_FORTIFY_SOURCE=2)
|
||||
endif()
|
||||
set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-unused-but-set-variable -Wno-unused-variable ${CMAKE_CXX_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-unused-but-set-variable -Wno-unused-variable -Wno-placement-new ${CMAKE_CXX_FLAGS}")
|
||||
|
||||
# gcc 4.3 and above don't like the LL boost and also
|
||||
# cause warnings due to our use of deprecated headers
|
||||
|
|
@ -180,6 +180,10 @@ if (LINUX)
|
|||
add_definitions(-std=gnu++11)
|
||||
# </FS:ND>
|
||||
|
||||
# <FS:ND> Enable old C++ ABI
|
||||
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
|
||||
# </FS:ND>
|
||||
|
||||
# force this platform to accept TOS via external browser <FS:ND> No, do not.
|
||||
# add_definitions(-DEXTERNAL_TOS)
|
||||
|
||||
|
|
@ -198,7 +202,8 @@ if (LINUX)
|
|||
# this stops us requiring a really recent glibc at runtime
|
||||
add_compile_options(-fno-stack-protector)
|
||||
# linking can be very memory-hungry, especially the final viewer link
|
||||
set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
|
||||
#set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
|
||||
set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory -Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../lib' -Wl,--exclude-libs,ALL")
|
||||
endif (NOT USESYSTEMLIBS)
|
||||
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ elseif (DARWIN)
|
|||
|
||||
elseif (LINUX)
|
||||
set(CEF_PLUGIN_LIBRARIES
|
||||
dullahan
|
||||
cef
|
||||
cef_dll_wrapper.a
|
||||
dullahan
|
||||
)
|
||||
endif (WINDOWS)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
# -*- cmake -*-
|
||||
include(Prebuilt)
|
||||
include(NGHTTP2)
|
||||
|
||||
set(CURL_FIND_QUIETLY ON)
|
||||
set(CURL_FIND_REQUIRED ON)
|
||||
|
|
@ -16,7 +17,7 @@ else (USESYSTEMLIBS)
|
|||
set(CURL_LIBRARIES libcurl.a)
|
||||
if (LINUX)
|
||||
list(APPEND CURL_LIBRARIES
|
||||
pthread
|
||||
pthread ${NGHTTP2_LIBRARIES}
|
||||
)
|
||||
endif (LINUX)
|
||||
endif (WINDOWS)
|
||||
|
|
|
|||
|
|
@ -41,15 +41,9 @@ if (FMODSTUDIO)
|
|||
debug fmodL
|
||||
optimized fmod)
|
||||
elseif (LINUX)
|
||||
if (ADDRESS_SIZE EQUAL 32)
|
||||
set(FMODSTUDIO_LIBRARY
|
||||
set(FMODSTUDIO_LIBRARY
|
||||
debug fmodL
|
||||
optimized fmod)
|
||||
elseif (ADDRESS_SIZE EQUAL 64)
|
||||
set(FMODSTUDIO_LIBRARY
|
||||
debug fmodL64
|
||||
optimized fmod64)
|
||||
endif(ADDRESS_SIZE EQUAL 32)
|
||||
endif (WINDOWS)
|
||||
set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
|
||||
set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
|
||||
|
|
|
|||
|
|
@ -16,11 +16,7 @@ else (USESYSTEMLIBS)
|
|||
elseif (DARWIN)
|
||||
set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
|
||||
elseif (LINUX)
|
||||
if ( ADDRESS_SIZE EQUAL 64 )
|
||||
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.6_libmt.a)
|
||||
else ( )
|
||||
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
|
||||
endif ( )
|
||||
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.8_libmt.a)
|
||||
endif (WINDOWS)
|
||||
set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/")
|
||||
endif (USESYSTEMLIBS)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
include (Prebuilt)
|
||||
use_prebuilt_binary(viewer-manager)
|
||||
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
|
|||
{
|
||||
return true; // done (failed)
|
||||
}
|
||||
if (!(mFormattedImage->getWidth() * mFormattedImage->getHeight() * mFormattedImage->getComponents()))
|
||||
if (0 == (mFormattedImage->getWidth() * mFormattedImage->getHeight() * mFormattedImage->getComponents()))
|
||||
{
|
||||
return true; // done (failed)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,17 @@
|
|||
#include "llsdserialize.h"
|
||||
#include "lljoint.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
|
||||
#endif
|
||||
|
||||
#include "glh/glh_linear.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#endif
|
||||
|
||||
#include "llmatrix4a.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,17 @@
|
|||
#include "lljoint.h"
|
||||
#include "llcallbacklist.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
|
||||
#endif
|
||||
|
||||
#include "glh/glh_linear.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#endif
|
||||
|
||||
#include "llmatrix4a.h"
|
||||
#include <boost/bind.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -137,14 +137,22 @@ S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te)
|
|||
// we're changing an existing entry
|
||||
llassert(mEntryList[index]);
|
||||
delete (mEntryList[index]);
|
||||
if (&te)
|
||||
{
|
||||
mEntryList[index] = te.newCopy();
|
||||
}
|
||||
else
|
||||
{
|
||||
mEntryList[index] = LLPrimTextureList::newTextureEntry();
|
||||
}
|
||||
|
||||
//<FS:ND> The compiler will assume te being valid as it is passed by reference and thus else will never be executed.
|
||||
// If someone really passed *nullptr in here, this will be undefined behaviour
|
||||
|
||||
// if (&te)
|
||||
// {
|
||||
// mEntryList[index] = te.newCopy();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// mEntryList[index] = LLPrimTextureList::newTextureEntry();
|
||||
// }
|
||||
|
||||
mEntryList[index] = te.newCopy();
|
||||
// </FS:ND>
|
||||
|
||||
return TEM_CHANGE_TEXTURE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,8 +43,18 @@
|
|||
#include "llinstancetracker.h"
|
||||
|
||||
#include "llglheaders.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
|
||||
#endif
|
||||
|
||||
#include "glh/glh_linear.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#endif
|
||||
|
||||
extern BOOL gDebugGL;
|
||||
extern BOOL gDebugSession;
|
||||
extern llofstream gFailLog;
|
||||
|
|
|
|||
|
|
@ -42,8 +42,18 @@
|
|||
#include "llpointer.h"
|
||||
#include "llglheaders.h"
|
||||
#include "llmatrix4a.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
|
||||
#endif
|
||||
|
||||
#include "glh/glh_linear.h"
|
||||
|
||||
#if LL_LINUX && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70000
|
||||
#pragma GCC diagnostic push
|
||||
#endif
|
||||
|
||||
class LLVertexBuffer;
|
||||
class LLCubeMap;
|
||||
class LLImageGL;
|
||||
|
|
|
|||
|
|
@ -1471,10 +1471,10 @@ BOOL LLWindowSDL::convertCoords(LLCoordGL from, LLCoordWindow *to)
|
|||
if (!to)
|
||||
return FALSE;
|
||||
|
||||
to->mX = from.mX;
|
||||
to->mY = mWindow->h - from.mY - 1;
|
||||
to->mX = from.mX;
|
||||
to->mY = mWindow->h - from.mY - 1;
|
||||
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL LLWindowSDL::convertCoords(LLCoordWindow from, LLCoordGL* to)
|
||||
|
|
@ -1482,31 +1482,31 @@ BOOL LLWindowSDL::convertCoords(LLCoordWindow from, LLCoordGL* to)
|
|||
if (!to)
|
||||
return FALSE;
|
||||
|
||||
to->mX = from.mX;
|
||||
to->mY = mWindow->h - from.mY - 1;
|
||||
to->mX = from.mX;
|
||||
to->mY = mWindow->h - from.mY - 1;
|
||||
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL LLWindowSDL::convertCoords(LLCoordScreen from, LLCoordWindow* to)
|
||||
{
|
||||
if (!to)
|
||||
return FALSE;
|
||||
return FALSE;
|
||||
|
||||
// In the fullscreen case, window and screen coordinates are the same.
|
||||
to->mX = from.mX;
|
||||
to->mY = from.mY;
|
||||
// In the fullscreen case, window and screen coordinates are the same.
|
||||
to->mX = from.mX;
|
||||
to->mY = from.mY;
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
BOOL LLWindowSDL::convertCoords(LLCoordWindow from, LLCoordScreen *to)
|
||||
{
|
||||
if (!to)
|
||||
return FALSE;
|
||||
return FALSE;
|
||||
|
||||
// In the fullscreen case, window and screen coordinates are the same.
|
||||
to->mX = from.mX;
|
||||
to->mY = from.mY;
|
||||
// In the fullscreen case, window and screen coordinates are the same.
|
||||
to->mX = from.mX;
|
||||
to->mY = from.mY;
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ if (LINUX)
|
|||
# message(FATAL_ERROR "CEF plugin has been enabled for a Linux compile.\n"
|
||||
# " Please create a volume_catcher implementation for this platform.")
|
||||
list(APPEND media_plugin_cef_SOURCE_FILES dummy_volume_catcher.cpp)
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'")
|
||||
elseif (DARWIN)
|
||||
list(APPEND media_plugin_cef_SOURCE_FILES mac_volume_catcher_null.cpp)
|
||||
find_library(CORESERVICES_LIBRARY CoreServices)
|
||||
|
|
|
|||
|
|
@ -94,3 +94,7 @@ if (DARWIN)
|
|||
)
|
||||
|
||||
endif (DARWIN)
|
||||
|
||||
if( LINUX )
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -2405,7 +2405,7 @@ if (NOT ENABLE_MEDIA_PLUGINS)
|
|||
linux-crash-logger
|
||||
SLPlugin
|
||||
media_plugin_cef
|
||||
media_plugin_gstreamer010
|
||||
#media_plugin_gstreamer010
|
||||
media_plugin_libvlc
|
||||
llcommon
|
||||
)
|
||||
|
|
@ -2415,7 +2415,7 @@ else (NOT ENABLE_MEDIA_PLUGINS)
|
|||
linux-crash-logger
|
||||
SLPlugin
|
||||
media_plugin_cef
|
||||
media_plugin_gstreamer010
|
||||
#media_plugin_gstreamer010
|
||||
llcommon
|
||||
)
|
||||
endif (NOT ENABLE_MEDIA_PLUGINS)
|
||||
|
|
|
|||
|
|
@ -13861,6 +13861,19 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>FSInternalShowNavbarFavoritesPanel</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Internal control to show/hide navigation bar favorites panel</string>
|
||||
<key>HideFromEditor</key>
|
||||
<integer>1</integer>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>ShowNavbarNavigationPanel</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -13872,6 +13885,19 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>FSInternalShowNavbarNavigationPanel</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Internal control to show/hide navigation bar navigation panel</string>
|
||||
<key>HideFromEditor</key>
|
||||
<integer>1</integer>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>ShowMiniLocationPanel</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -24587,6 +24613,28 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>FSUseReadOfflineMsgsCap</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>If enabled, use the ReadOfflineMsgsCap to request offline messages at login</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>FSExperimentalRegionCrossingMovementFix</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>If enabled, use the experimental fix for region crossing movements being bogus due to false predictions by the viewer.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
</map>
|
||||
</llsd>
|
||||
|
||||
|
|
|
|||
|
|
@ -1708,7 +1708,7 @@ LLUUID cmdline_partial_name2key(std::string partial_name)
|
|||
void cmdline_tp2name(const std::string& target)
|
||||
{
|
||||
LLUUID avkey = cmdline_partial_name2key(target);
|
||||
if (avkey.notNull())
|
||||
if (avkey.notNull() && avkey != gAgentID)
|
||||
{
|
||||
LLAvatarActions::teleportTo(avkey);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ void ColladaExportFloater::CacheReadResponder::completed(bool success)
|
|||
else
|
||||
{
|
||||
// For other formats we need to decode first
|
||||
if (mFormattedImage->updateData() && (mFormattedImage->getWidth() * mFormattedImage->getHeight() * mFormattedImage->getComponents()))
|
||||
if (mFormattedImage->updateData() && ( (mFormattedImage->getWidth() * mFormattedImage->getHeight() * mFormattedImage->getComponents()) != 0 ) )
|
||||
{
|
||||
LLPointer<LLImageRaw> raw = new LLImageRaw;
|
||||
raw->resize(mFormattedImage->getWidth(), mFormattedImage->getHeight(), mFormattedImage->getComponents());
|
||||
|
|
|
|||
|
|
@ -103,29 +103,33 @@ class FSViewerManifest:
|
|||
|
||||
self.run_command_shell( "cd %s && objcopy --add-gnu-debuglink=%s %s" % (debugDir, debugName, fileBin) )
|
||||
|
||||
if( os.path.exists( "%s/firestorm-symbols-linux.tar.bz2" % self.args['configuration'].lower()) ):
|
||||
symName = "%s/Phoenix_%s_%s_%s_symbols-linux.tar.bz2" % ( self.args['configuration'].lower(), self.fs_channel_legacy_oneword(),
|
||||
'-'.join( self.args['version'] ), self.args['viewer_flavor'] )
|
||||
if( os.path.exists( "%s/firestorm-symbols-linux-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size)) ):
|
||||
symName = "%s/Phoenix_%s_%s_%s_symbols-linux-%d.tar.bz2" % ( self.args['configuration'].lower(), self.fs_channel_legacy_oneword(),
|
||||
'-'.join( self.args['version'] ), self.args['viewer_flavor'], self.address_size )
|
||||
print( "Saving symbols %s" % symName )
|
||||
os.rename("%s/firestorm-symbols-linux.tar.bz2" % self.args['configuration'].lower(), symName )
|
||||
os.rename("%s/firestorm-symbols-linux-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size), symName )
|
||||
|
||||
def fs_linux_tar_excludes(self):
|
||||
return "--exclude core --exclude .debug/* --exclude .debug"
|
||||
installer_name_components = ['Phoenix',self.app_name(),self.args.get('arch'),'.'.join(self.args['version'])]
|
||||
installer_name = "_".join(installer_name_components)
|
||||
return "--exclude=%s/bin/.debug" % installer_name
|
||||
|
||||
def fs_save_windows_symbols(self, substitution_strings):
|
||||
#AO: Try to package up symbols
|
||||
# New Method, for reading cross platform stack traces on a linux/mac host
|
||||
if (os.path.exists("%s/firestorm-symbols-windows.tar.bz2" % self.args['configuration'].lower())):
|
||||
if (os.path.exists("%s/firestorm-symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(),
|
||||
self.address_size))):
|
||||
# Rename to add version numbers
|
||||
sName = "%s/Phoenix_%s_%s_%s_symbols-windows.tar.bz2" % (self.args['configuration'].lower(),
|
||||
sName = "%s/Phoenix_%s_%s_%s_symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(),
|
||||
self.fs_channel_legacy_oneword(),
|
||||
substitution_strings['version_dashes'],
|
||||
self.args['viewer_flavor'])
|
||||
self.args['viewer_flavor'],
|
||||
self.address_size)
|
||||
|
||||
if os.path.exists( sName ):
|
||||
os.unlink( sName )
|
||||
|
||||
os.rename("%s/firestorm-symbols-windows.tar.bz2" % self.args['configuration'].lower(), sName )
|
||||
os.rename("%s/firestorm-symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size), sName )
|
||||
|
||||
pdbName = "firestorm-bin.pdb"
|
||||
try:
|
||||
|
|
@ -141,10 +145,11 @@ class FSViewerManifest:
|
|||
# Store windows symbols we want to keep for debugging in a tar file, this will be later compressed with xz (lzma)
|
||||
# Using tat+xz gives far superior compression than zip (~half the size of the zip archive).
|
||||
# Python3 natively supports tar+xz via mode 'w:xz'. But we're stuck with Python2 for now.
|
||||
symbolTar = tarfile.TarFile("%s/Phoenix_%s_%s_%s_pdbsymbols-windows.tar" % (self.args['configuration'].lower(),
|
||||
symbolTar = tarfile.TarFile("%s/Phoenix_%s_%s_%s_pdbsymbols-windows-%d.tar" % (self.args['configuration'].lower(),
|
||||
self.fs_channel_legacy_oneword(),
|
||||
substitution_strings['version_dashes'],
|
||||
self.args['viewer_flavor']),
|
||||
self.args['viewer_flavor'],
|
||||
self.address_size),
|
||||
'w')
|
||||
symbolTar.add( "%s/Firestorm-bin.exe" % self.args['configuration'].lower(), "firestorm-bin.exe" )
|
||||
symbolTar.add( "%s/%s" % (self.args['configuration'].lower(),pdbName), pdbName )
|
||||
|
|
|
|||
|
|
@ -966,10 +966,8 @@ LLSD FSData::getSystemInfo()
|
|||
LLSD info = LLAppViewer::instance()->getViewerInfo();
|
||||
|
||||
std::string sysinfo1("\n");
|
||||
sysinfo1 += llformat("%s %s (%d) %s %s (%s) %s\n\n", LLAppViewer::instance()->getSecondLifeTitle().c_str(), LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild(), info["BUILD_DATE"].asString().c_str(), info["BUILD_TIME"].asString().c_str(), LLVersionInfo::getChannel().c_str(),
|
||||
//<FS:CR> FIRE-8273: Add Havok/Opensim indicator to getSystemInfo()
|
||||
info["BUILD_TYPE"].asString().c_str());
|
||||
// </FS:CR>
|
||||
sysinfo1 += llformat("%s %s (%d) %s %s (%s %dbit) %s\n\n", LLAppViewer::instance()->getSecondLifeTitle().c_str(), LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild(), info["BUILD_DATE"].asString().c_str(), info["BUILD_TIME"].asString().c_str(), LLVersionInfo::getChannel().c_str(),
|
||||
info["ADDRESS_SIZE"].asInteger(), info["BUILD_TYPE"].asString().c_str());
|
||||
sysinfo1 += llformat("Build with %s version %s\n\n", info["COMPILER"].asString().c_str(), info["COMPILER_VERSION"].asString().c_str());
|
||||
sysinfo1 += llformat("I am in %s located at %s (%s)\n", info["REGION"].asString().c_str(), info["HOSTNAME"].asString().c_str(), info["HOSTIP"].asString().c_str());
|
||||
sysinfo1 += llformat("%s\n\n", info["SERVER_VERSION"].asString().c_str());
|
||||
|
|
@ -990,7 +988,7 @@ LLSD FSData::getSystemInfo()
|
|||
sysinfo2 += llformat("libcurl Version: %s\n", info["LIBCURL_VERSION"].asString().c_str());
|
||||
sysinfo2 += llformat("J2C Decoder Version: %s\n", info["J2C_VERSION"].asString().c_str());
|
||||
sysinfo2 += llformat("Audio Driver Version: %s\n", info["AUDIO_DRIVER_VERSION"].asString().c_str());
|
||||
sysinfo2 += llformat("CEF Version: %s\n", info["LLCEFLIB_VERSION"].asString().c_str());
|
||||
sysinfo2 += llformat("%s\n", info["LIBCEF_VERSION"].asString().c_str());
|
||||
sysinfo2 += llformat("LibVLC Version: %s\n", info["LIBVLC_VERSION"].asString().c_str());
|
||||
|
||||
sysinfo2 += llformat("Vivox Version: %s\n", info["VOICE_VERSION"].asString().c_str());
|
||||
|
|
|
|||
|
|
@ -864,33 +864,35 @@ void FSRadar::teleportToAvatar(const LLUUID& targetAv)
|
|||
}
|
||||
else
|
||||
{
|
||||
// <FS:TS> FIRE-20862: Teleport the configured offset
|
||||
// toward the center of the region from the
|
||||
// <FS:TS> FIRE-20862: Teleport the configured offset toward the center of the region from the
|
||||
// avatar's reported position
|
||||
LLViewerRegion* avreg = world->getRegionFromPosGlobal(avpos);
|
||||
LLVector3d region_center = avreg->getCenterGlobal();
|
||||
LLVector3d offset = avpos - region_center;
|
||||
LLVector3d destination;
|
||||
F32 lateral_distance= gSavedSettings.getF32("FSTeleportToOffsetLateral");
|
||||
F32 vertical_distance= gSavedSettings.getF32("FSTeleportToOffsetVertical");
|
||||
if (offset.normalize() != 0.f) // there's an actual offset
|
||||
{
|
||||
if (lateral_distance > 0.0f)
|
||||
{
|
||||
offset *= lateral_distance;
|
||||
destination = avpos - offset;
|
||||
}
|
||||
else
|
||||
{
|
||||
destination = avpos;
|
||||
}
|
||||
}
|
||||
else // the target is exactly at the center, so the offset is 0
|
||||
if (avreg)
|
||||
{
|
||||
destination = region_center + LLVector3d(0.f, lateral_distance, 0.f);
|
||||
LLVector3d region_center = avreg->getCenterGlobal();
|
||||
LLVector3d offset = avpos - region_center;
|
||||
LLVector3d destination;
|
||||
F32 lateral_distance = gSavedSettings.getF32("FSTeleportToOffsetLateral");
|
||||
F32 vertical_distance = gSavedSettings.getF32("FSTeleportToOffsetVertical");
|
||||
if (offset.normalize() != 0.f) // there's an actual offset
|
||||
{
|
||||
if (lateral_distance > 0.0f)
|
||||
{
|
||||
offset *= lateral_distance;
|
||||
destination = avpos - offset;
|
||||
}
|
||||
else
|
||||
{
|
||||
destination = avpos;
|
||||
}
|
||||
}
|
||||
else // the target is exactly at the center, so the offset is 0
|
||||
{
|
||||
destination = region_center + LLVector3d(0.f, lateral_distance, 0.f);
|
||||
}
|
||||
destination.mdV[VZ] = avpos.mdV[VZ] + vertical_distance;
|
||||
gAgent.teleportViaLocation(destination);
|
||||
}
|
||||
destination.mdV[VZ] = avpos.mdV[VZ] + vertical_distance;
|
||||
gAgent.teleportViaLocation(destination);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@ S32 gLastExecDuration = -1; // (<0 indicates unknown)
|
|||
# define LL_PLATFORM_KEY "mac"
|
||||
#elif LL_LINUX
|
||||
# define LL_PLATFORM_KEY "lnx"
|
||||
else
|
||||
#else
|
||||
# error "Unknown Platform"
|
||||
#endif
|
||||
const char* gPlatform = LL_PLATFORM_KEY;
|
||||
|
|
@ -1144,10 +1144,11 @@ bool LLAppViewer::init()
|
|||
|
||||
if (!initCache())
|
||||
{
|
||||
LL_WARNS("InitInfo") << "Failed to init cache" << LL_ENDL;
|
||||
std::ostringstream msg;
|
||||
msg << LLTrans::getString("MBUnableToAccessFile");
|
||||
OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
LL_INFOS("InitInfo") << "Cache initialization is done." << LL_ENDL ;
|
||||
|
||||
|
|
@ -1654,7 +1655,8 @@ bool LLAppViewer::doFrame()
|
|||
// Scan keyboard for movement keys. Command keys and typing
|
||||
// are handled by windows callbacks. Don't do this until we're
|
||||
// done initializing. JC
|
||||
if ((gHeadlessClient || gViewerWindow->getWindow()->getVisible())
|
||||
if (gViewerWindow
|
||||
&& (gHeadlessClient || gViewerWindow->getWindow()->getVisible())
|
||||
&& gViewerWindow->getActive()
|
||||
&& !gViewerWindow->getWindow()->getMinimized()
|
||||
&& LLStartUp::getStartupState() == STATE_STARTED
|
||||
|
|
@ -1693,7 +1695,7 @@ bool LLAppViewer::doFrame()
|
|||
|
||||
// Render scene.
|
||||
// *TODO: Should we run display() even during gHeadlessClient? DK 2011-02-18
|
||||
if (!LLApp::isExiting() && !gHeadlessClient)
|
||||
if (!LLApp::isExiting() && !gHeadlessClient && gViewerWindow)
|
||||
{
|
||||
pingMainloopTimeout("Main:Display");
|
||||
gGLActive = TRUE;
|
||||
|
|
|
|||
|
|
@ -1047,10 +1047,15 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po
|
|||
const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset);
|
||||
const LLVector4a& normal4a = vf.mNormals[0];
|
||||
const LLVector4a& tangent = vf.mTangents[0];
|
||||
if (!&tangent)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// <FS:ND> tangent is a reference, compiler will always assume it's valid and skip the check due to tangent==nullptr being undefined behaviour.
|
||||
|
||||
// if (!&tangent)
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
// </FS:ND>
|
||||
|
||||
LLVector4a binormal4a;
|
||||
binormal4a.setCross3(normal4a, tangent);
|
||||
|
|
|
|||
|
|
@ -1252,13 +1252,13 @@ static std::string add_anim_filter_to_gtkchooser(GtkWindow *picker)
|
|||
static std::string add_xml_filter_to_gtkchooser(GtkWindow *picker)
|
||||
{
|
||||
return add_simple_pattern_filter_to_gtkchooser(picker, "*.xml",
|
||||
LLTrans::getString("xml_files") + " (*.xml)");
|
||||
LLTrans::getString("xml_file") + " (*.xml)");
|
||||
}
|
||||
|
||||
static std::string add_collada_filter_to_gtkchooser(GtkWindow *picker)
|
||||
{
|
||||
return add_simple_pattern_filter_to_gtkchooser(picker, "*.dae",
|
||||
LLTrans::getString("scene_files") + " (*.dae)");
|
||||
LLTrans::getString("collada_files") + " (*.dae)");
|
||||
}
|
||||
|
||||
static std::string add_imageload_filter_to_gtkchooser(GtkWindow *picker)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -47,7 +47,8 @@ public:
|
|||
LLVector3 position,
|
||||
U8 *binary_bucket,
|
||||
S32 binary_bucket_size,
|
||||
LLHost &sender);
|
||||
LLHost &sender,
|
||||
LLUUID aux_id = LLUUID::null);
|
||||
|
||||
// Either receives list of offline messages from 'ReadOfflineMsgs' capability
|
||||
// or uses legacy method
|
||||
|
|
|
|||
|
|
@ -1230,7 +1230,7 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
|
|||
{
|
||||
if(prev_folder_item)
|
||||
{
|
||||
LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
|
||||
LLFolderBridge* prev_bridge = static_cast<LLFolderBridge*>(prev_folder_item->getViewModelItem());
|
||||
if(prev_bridge)
|
||||
{
|
||||
prev_bridge->clearDisplayName();
|
||||
|
|
@ -1239,7 +1239,7 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
|
|||
}
|
||||
}
|
||||
|
||||
LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
|
||||
LLFolderBridge* bridge = static_cast<LLFolderBridge*>(folder_item->getViewModelItem());
|
||||
if(bridge)
|
||||
{
|
||||
bridge->clearDisplayName();
|
||||
|
|
@ -1254,7 +1254,7 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
|
|||
{
|
||||
if(prev_folder_item)
|
||||
{
|
||||
LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
|
||||
LLFolderBridge* prev_bridge = static_cast<LLFolderBridge*>(prev_folder_item->getViewModelItem());
|
||||
if(prev_bridge)
|
||||
{
|
||||
prev_bridge->clearDisplayName();
|
||||
|
|
|
|||
|
|
@ -827,21 +827,6 @@ void LLMediaCtrl::draw()
|
|||
S32 x_offset, y_offset, width, height;
|
||||
calcOffsetsAndSize(&x_offset, &y_offset, &width, &height);
|
||||
|
||||
#if 0
|
||||
// <FS:ND> Flip Y-Axis of media texture
|
||||
U32 mode = gGL.getMatrixMode();
|
||||
gGL.matrixMode(LLRender::MM_TEXTURE0);
|
||||
|
||||
F32 aMatrix[16] = { 1.0f, 0.0f, 0.0f, 0.0f,
|
||||
0.0f, -1.0f, 0.0f, 0.0f,
|
||||
0.0f, 0.0f, 1.0f, 0.0f,
|
||||
0.0f, max_v, 0.0f, 1.0f
|
||||
};
|
||||
gGL.pushMatrix();
|
||||
gGL.loadMatrix( aMatrix );
|
||||
gGL.matrixMode(mode);
|
||||
// </FS:ND>
|
||||
#endif
|
||||
// draw the browser
|
||||
// <FS:Ansariel> Remove QUADS rendering mode
|
||||
//gGL.begin( LLRender::QUADS );
|
||||
|
|
@ -894,13 +879,6 @@ void LLMediaCtrl::draw()
|
|||
gGL.vertex2i( x_offset + width, y_offset );
|
||||
}
|
||||
gGL.end();
|
||||
#if 0
|
||||
// <FS:ND> Restore matrix for texture 0
|
||||
gGL.matrixMode(LLRender::MM_TEXTURE0);
|
||||
gGL.popMatrix();
|
||||
gGL.matrixMode( mode );
|
||||
// </FS:ND>
|
||||
#endif
|
||||
}
|
||||
gGL.popUIMatrix();
|
||||
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ bool LLMediaDataClient::isInQueue(const LLMediaDataClientObject::ptr_t &object)
|
|||
if (std::find_if(mUnQueuedRequests.begin(), mUnQueuedRequests.end(), upred) != mUnQueuedRequests.end())
|
||||
return true;
|
||||
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
void LLMediaDataClient::removeFromQueue(const LLMediaDataClientObject::ptr_t &object)
|
||||
|
|
@ -815,14 +815,14 @@ bool LLObjectMediaDataClient::isEmpty() const
|
|||
|
||||
bool LLObjectMediaDataClient::isInQueue(const LLMediaDataClientObject::ptr_t &object)
|
||||
{
|
||||
// First, call parent impl.
|
||||
if(LLMediaDataClient::isInQueue(object))
|
||||
return true;
|
||||
// First, call parent impl.
|
||||
if(LLMediaDataClient::isInQueue(object))
|
||||
return true;
|
||||
|
||||
if (std::find_if(mRoundRobinQueue.begin(), mRoundRobinQueue.end(), PredicateMatchRequest(object->getID())) != mRoundRobinQueue.end())
|
||||
return true;
|
||||
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
void LLObjectMediaDataClient::removeFromQueue(const LLMediaDataClientObject::ptr_t &object)
|
||||
|
|
|
|||
|
|
@ -557,6 +557,13 @@ void set_flags_and_update_appearance()
|
|||
// true when all initialization done.
|
||||
bool idle_startup()
|
||||
{
|
||||
if (gViewerWindow == NULL)
|
||||
{
|
||||
// We expect window to be initialized
|
||||
LL_WARNS_ONCE() << "gViewerWindow is not initialized" << LL_ENDL;
|
||||
return false; // No world yet
|
||||
}
|
||||
|
||||
const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay");
|
||||
static LLTimer timeout;
|
||||
|
||||
|
|
@ -643,6 +650,11 @@ bool idle_startup()
|
|||
gSavedSettings.setString("FSInternalSkinCurrentTheme", gSavedSettings.getString("FSSkinCurrentThemeReadableName"));
|
||||
// </FS:Ansariel>
|
||||
|
||||
// <FS:Ansariel> Notification not showing if hiding the UI
|
||||
gSavedSettings.setBOOL("FSInternalShowNavbarNavigationPanel", gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
|
||||
gSavedSettings.setBOOL("FSInternalShowNavbarFavoritesPanel", gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
|
||||
// </FS:Ansariel>
|
||||
|
||||
if (LLFeatureManager::getInstance()->isSafe())
|
||||
{
|
||||
LLNotificationsUtil::add("DisplaySetToSafe");
|
||||
|
|
|
|||
|
|
@ -919,6 +919,14 @@ void handleStaticEyesChanged()
|
|||
}
|
||||
// </FS:Ansariel>
|
||||
|
||||
// <FS:Ansariel> Notification not showing if hiding the UI
|
||||
void handleNavbarSettingsChanged()
|
||||
{
|
||||
gSavedSettings.setBOOL("FSInternalShowNavbarNavigationPanel", gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
|
||||
gSavedSettings.setBOOL("FSInternalShowNavbarFavoritesPanel", gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
|
||||
}
|
||||
// </FS:Ansariel>
|
||||
|
||||
// <FS:Ansariel> FIRE-20288: Option to render friends only
|
||||
void handleRenderFriendsOnlyChanged(const LLSD& newvalue)
|
||||
{
|
||||
|
|
@ -1167,6 +1175,11 @@ void settings_setup_listeners()
|
|||
|
||||
// <FS:Ansariel> FIRE-20288: Option to render friends only
|
||||
gSavedPerAccountSettings.getControl("FSRenderFriendsOnly")->getSignal()->connect(boost::bind(&handleRenderFriendsOnlyChanged, _2));
|
||||
|
||||
// <FS:Ansariel> Notification not showing if hiding the UI
|
||||
gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&handleNavbarSettingsChanged));
|
||||
gSavedSettings.getControl("ShowNavbarNavigationPanel")->getSignal()->connect(boost::bind(&handleNavbarSettingsChanged));
|
||||
// </FS:Ansariel>
|
||||
}
|
||||
|
||||
#if TEST_CACHED_CONTROL
|
||||
|
|
|
|||
|
|
@ -2709,20 +2709,24 @@ void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& time, con
|
|||
// Extrapolation across region boundaries is almost always wrong, and if the region being
|
||||
// entered is slow to respond, very wrong.
|
||||
// Probably don't need edge of world check below any more since we are clipping the predictor to the region.
|
||||
bool clipped; // true if clipped at boundary
|
||||
LLVector3d clip_pos_global_region = LLWorld::getInstance()->clipToRegion(mRegionp,old_pos_global, new_pos_global, clipped);
|
||||
if (clipped)
|
||||
static LLCachedControl<bool> fsExperimentalRegionCrossingMovementFix(gSavedSettings, "FSExperimentalRegionCrossingMovementFix");
|
||||
if (fsExperimentalRegionCrossingMovementFix)
|
||||
{
|
||||
// Was clipped, so we crossed a region boundary
|
||||
//LL_INFOS() << "Beyond region edge, clipped predicted position to " << mRegionp->getPosRegionFromGlobal(clip_pos_global_region)
|
||||
// << " from [" << getPositionRegion() << " .. " << new_pos << "]" << LL_ENDL;
|
||||
new_pos = mRegionp->getPosRegionFromGlobal(clip_pos_global_region);
|
||||
// Don't zero out velocity on the server. Telling the server affects scripts and audio.
|
||||
//new_v.clear();
|
||||
//setAcceleration(LLVector3::zero); // stop linear acceleration
|
||||
LLVector3 new_angv;
|
||||
new_angv.clear();
|
||||
setAngularVelocity(new_angv); // stop rotation
|
||||
bool clipped; // true if clipped at boundary
|
||||
LLVector3d clip_pos_global_region = LLWorld::getInstance()->clipToRegion(mRegionp, old_pos_global, new_pos_global, clipped);
|
||||
if (clipped)
|
||||
{
|
||||
// Was clipped, so we crossed a region boundary
|
||||
//LL_INFOS() << "Beyond region edge, clipped predicted position to " << mRegionp->getPosRegionFromGlobal(clip_pos_global_region)
|
||||
// << " from [" << getPositionRegion() << " .. " << new_pos << "]" << LL_ENDL;
|
||||
new_pos = mRegionp->getPosRegionFromGlobal(clip_pos_global_region);
|
||||
// Don't zero out velocity on the server. Telling the server affects scripts and audio.
|
||||
//new_v.clear();
|
||||
//setAcceleration(LLVector3::zero); // stop linear acceleration
|
||||
LLVector3 new_angv;
|
||||
new_angv.clear();
|
||||
setAngularVelocity(new_angv); // stop rotation
|
||||
}
|
||||
}
|
||||
// </FS>
|
||||
|
||||
|
|
|
|||
|
|
@ -6856,6 +6856,10 @@ void LLViewerWindow::setUIVisibility(bool visible)
|
|||
|
||||
// <FS:Ansariel> Notification not showing if hiding the UI
|
||||
FSNearbyChat::instance().showDefaultChatBar(visible && !gSavedSettings.getBOOL("AutohideChatBar"));
|
||||
gSavedSettings.setBOOL("FSInternalShowNavbarNavigationPanel", visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
|
||||
gSavedSettings.setBOOL("FSInternalShowNavbarFavoritesPanel", visible && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
|
||||
mRootView->getChildView("chiclet_container")->setVisible(visible);
|
||||
// </FS:Ansariel>
|
||||
|
||||
// <FS:Zi> Is done inside XUI now, using visibility_control
|
||||
//LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
|
||||
|
|
|
|||
|
|
@ -785,7 +785,10 @@ bool LLVivoxVoiceClient::callbackEndDaemon(const LLSD& data)
|
|||
bool LLVivoxVoiceClient::startAndLaunchDaemon()
|
||||
{
|
||||
//---------------------------------------------------------------------
|
||||
if (!voiceEnabled())
|
||||
// </FS:Ansariel> Bypass cached controls
|
||||
//if (!voiceEnabled())
|
||||
if (!voiceEnabled(true))
|
||||
// </FS:Ansariel>
|
||||
{
|
||||
// Voice is locked out, we must not launch the vivox daemon.
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -4918,11 +4918,6 @@ bool can_batch_texture(LLFace* facep)
|
|||
{ //texture animation breaks batches
|
||||
return false;
|
||||
}
|
||||
|
||||
if( facep->mTextureMatrix &&
|
||||
( ( facep->getTextureEntry() && facep->getTextureEntry()->hasMedia() ) ||
|
||||
( facep->getTexture() && facep->getTexture()->getType() == LLViewerTexture::MEDIA_TEXTURE ) ) )
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -5036,13 +5031,6 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
|
|||
tex_mat = facep->mTextureMatrix;
|
||||
}
|
||||
|
||||
// <FS:ND> CEF: if this is a face with media, then use the texture matrix to flip the texture
|
||||
if( facep->mTextureMatrix &&
|
||||
( ( facep->getTextureEntry() && facep->getTextureEntry()->hasMedia() ) ||
|
||||
( facep->getTexture() && facep->getTexture()->getType() == LLViewerTexture::MEDIA_TEXTURE ) ) )
|
||||
tex_mat = facep->mTextureMatrix;
|
||||
// </FS:ND>
|
||||
|
||||
const LLMatrix4* model_mat = NULL;
|
||||
|
||||
LLDrawable* drawable = facep->getDrawable();
|
||||
|
|
|
|||
|
|
@ -787,6 +787,8 @@ LLVector3d LLWorld::clipToVisibleRegions(const LLVector3d &start_pos, const LLVe
|
|||
// If start_pos is outside the region, use start_pos.
|
||||
LLVector3d LLWorld::clipToRegion(const LLViewerRegion* regionp, const LLVector3d &start_pos, const LLVector3d &end_pos, bool &clipped)
|
||||
{
|
||||
static LLCachedControl<bool> fsExperimentalRegionCrossingMovementFix(gSavedSettings, "FSExperimentalRegionCrossingMovementFix");
|
||||
|
||||
clipped = false; // no clipping yet
|
||||
if (!regionp) // no region. We're lost
|
||||
{
|
||||
|
|
@ -808,8 +810,9 @@ LLVector3d LLWorld::clipToRegion(const LLViewerRegion* regionp, const LLVector3d
|
|||
// </FS>
|
||||
F32 region_width = regionp->getWidth();
|
||||
// <FS> FIRE-21915: Fix bogus avatar movement on region crossing
|
||||
if (region_coord_start.mV[VX] < 0.f || region_coord_start.mV[VX] > region_width
|
||||
|| region_coord_start.mV[VY] < 0.f || region_coord_start.mV[VY] > region_width)
|
||||
if (fsExperimentalRegionCrossingMovementFix &&
|
||||
(region_coord_start.mV[VX] < 0.f || region_coord_start.mV[VX] > region_width
|
||||
|| region_coord_start.mV[VY] < 0.f || region_coord_start.mV[VY] > region_width))
|
||||
{
|
||||
clip_factor = 1.0; // start pos outside region, use start pos
|
||||
}
|
||||
|
|
@ -853,8 +856,14 @@ LLVector3d LLWorld::clipToRegion(const LLViewerRegion* regionp, const LLVector3d
|
|||
clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];
|
||||
}
|
||||
// <FS> FIRE-21915: Fix bogus avatar movement on region crossing
|
||||
if (!std::isfinite(clip_factor)) { clip_factor = 0.0; } // avoid NaN problems
|
||||
clip_factor = llclamp(clip_factor, 0.0, 1.0); // avoid overflow problem
|
||||
if (!std::isfinite(clip_factor))
|
||||
{
|
||||
clip_factor = 0.0; // avoid NaN problems
|
||||
}
|
||||
else
|
||||
{
|
||||
clip_factor = llclamp(clip_factor, 0.0, 1.0); // avoid overflow problem
|
||||
}
|
||||
}
|
||||
// </FS>
|
||||
|
||||
|
|
@ -868,21 +877,36 @@ LLVector3d LLWorld::clipToRegion(const LLViewerRegion* regionp, const LLVector3d
|
|||
//final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
|
||||
// (F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO));
|
||||
|
||||
// True if clipped. Caller needs to know, because it will kill velocity if there's clipping
|
||||
// Don't do this by comparing floating point numbers for equality. That has roundoff problems.
|
||||
clipped = clip_factor > F_ALMOST_ZERO; // clipped in X or Y
|
||||
LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
|
||||
clipped |= final_region_pos.mdV[VX] < -F_ALMOST_ZERO || final_region_pos.mdV[VX] > (F64)(region_width - F_ALMOST_ZERO);
|
||||
clipped |= final_region_pos.mdV[VY] < -F_ALMOST_ZERO || final_region_pos.mdV[VY] > (F64)(region_width - F_ALMOST_ZERO);
|
||||
clipped |= final_region_pos.mdV[VZ] < -F_ALMOST_ZERO || final_region_pos.mdV[VZ] > (F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO); // if actually clipping
|
||||
// Final sanity check - don't allow positions more than clamp_range out of region.
|
||||
F64 clamp_range = region_width / 2.0; // half a region width
|
||||
final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], -clamp_range,
|
||||
(F64)(region_width + clamp_range));
|
||||
final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], -clamp_range,
|
||||
(F64)(region_width + clamp_range));
|
||||
final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
|
||||
(F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO));
|
||||
LLVector3d final_region_pos;
|
||||
if (fsExperimentalRegionCrossingMovementFix)
|
||||
{
|
||||
// True if clipped. Caller needs to know, because it will kill velocity if there's clipping
|
||||
// Don't do this by comparing floating point numbers for equality. That has roundoff problems.
|
||||
clipped = clip_factor > F_ALMOST_ZERO; // clipped in X or Y
|
||||
final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
|
||||
clipped |= final_region_pos.mdV[VX] < -F_ALMOST_ZERO || final_region_pos.mdV[VX] > (F64)(region_width - F_ALMOST_ZERO);
|
||||
clipped |= final_region_pos.mdV[VY] < -F_ALMOST_ZERO || final_region_pos.mdV[VY] > (F64)(region_width - F_ALMOST_ZERO);
|
||||
clipped |= final_region_pos.mdV[VZ] < -F_ALMOST_ZERO || final_region_pos.mdV[VZ] > (F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO); // if actually clipping
|
||||
// Final sanity check - don't allow positions more than clamp_range out of region.
|
||||
F64 clamp_range = region_width / 2.0; // half a region width
|
||||
final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], -clamp_range,
|
||||
(F64)(region_width + clamp_range));
|
||||
final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], -clamp_range,
|
||||
(F64)(region_width + clamp_range));
|
||||
final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
|
||||
(F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO));
|
||||
}
|
||||
else
|
||||
{
|
||||
// clamp to within region dimensions
|
||||
final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
|
||||
final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], 0.0,
|
||||
(F64)(region_width - F_ALMOST_ZERO));
|
||||
final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], 0.0,
|
||||
(F64)(region_width - F_ALMOST_ZERO));
|
||||
final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
|
||||
(F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO));
|
||||
}
|
||||
// </FS>
|
||||
return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip, const
|
|||
mCertStore = gSavedSettings.getString("CertStore");
|
||||
|
||||
httpOpts->setSSLVerifyPeer( vefifySSLCert );
|
||||
httpOpts->setSSLVerifyHost( vefifySSLCert ? 2 : 0);
|
||||
httpOpts->setSSLVerifyHost( vefifySSLCert );
|
||||
|
||||
// LLRefCounted starts with a 1 ref, so don't add a ref in the smart pointer
|
||||
httpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders());
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
reuse_instance="true"
|
||||
title="Appearance"
|
||||
min_height="200"
|
||||
min_width="325"
|
||||
min_width="351"
|
||||
width="333">
|
||||
<panel
|
||||
top="18"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
height="22"
|
||||
layout="topleft"
|
||||
name="navigation_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarNavigationPanel"
|
||||
visibility_control="FSInternalShowNavbarNavigationPanel"
|
||||
auto_resize="false"
|
||||
width="1024">
|
||||
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
height="15"
|
||||
layout="topleft"
|
||||
name="favorites_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarFavoritesPanel"
|
||||
visibility_control="FSInternalShowNavbarFavoritesPanel"
|
||||
auto_resize="false">
|
||||
|
||||
<favorites_bar
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
height="22"
|
||||
layout="topleft"
|
||||
name="navigation_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarNavigationPanel"
|
||||
visibility_control="FSInternalShowNavbarNavigationPanel"
|
||||
auto_resize="false"
|
||||
width="1024">
|
||||
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
height="15"
|
||||
layout="topleft"
|
||||
name="favorites_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarFavoritesPanel"
|
||||
visibility_control="FSInternalShowNavbarFavoritesPanel"
|
||||
auto_resize="true">
|
||||
|
||||
<favorites_bar
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
height="24"
|
||||
layout="topleft"
|
||||
name="navigation_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarNavigationPanel"
|
||||
visibility_control="FSInternalShowNavbarNavigationPanel"
|
||||
width="1024"
|
||||
auto_resize="false">
|
||||
|
||||
|
|
@ -227,7 +227,7 @@
|
|||
height="15"
|
||||
layout="topleft"
|
||||
name="favorites_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarFavoritesPanel"
|
||||
visibility_control="FSInternalShowNavbarFavoritesPanel"
|
||||
auto_resize="false">
|
||||
|
||||
<favorites_bar
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
height="24"
|
||||
layout="topleft"
|
||||
name="navigation_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarNavigationPanel"
|
||||
visibility_control="FSInternalShowNavbarNavigationPanel"
|
||||
width="1024"
|
||||
auto_resize="false">
|
||||
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
height="15"
|
||||
layout="topleft"
|
||||
name="favorites_bar_visibility_panel"
|
||||
visibility_control="ShowNavbarFavoritesPanel"
|
||||
visibility_control="FSInternalShowNavbarFavoritesPanel"
|
||||
auto_resize="false">
|
||||
|
||||
<favorites_bar
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
animate="false"
|
||||
follows="top|left"
|
||||
clip="false"
|
||||
height="9"
|
||||
height="27"
|
||||
width="200"
|
||||
left_pad="0"
|
||||
layout="topleft"
|
||||
orientation="horizontal"
|
||||
name="ls_control_panel"
|
||||
top="18"
|
||||
top="0"
|
||||
left="3">
|
||||
<layout_panel
|
||||
name="lp_translate_btn"
|
||||
|
|
|
|||
|
|
@ -1957,12 +1957,16 @@ class LinuxManifest(ViewerManifest):
|
|||
with self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release'), dst="lib"):
|
||||
self.path( "libcef.so" )
|
||||
self.path( "libllceflib.so" )
|
||||
|
||||
with self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ):
|
||||
self.path( "*.so" )
|
||||
|
||||
with self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'release'), dst="bin"):
|
||||
self.path( "chrome-sandbox" )
|
||||
self.path( "llceflib_host" )
|
||||
self.path( "dullahan_host" )
|
||||
self.path( "natives_blob.bin" )
|
||||
self.path( "snapshot_blob.bin" )
|
||||
self.path( "v8_context_snapshot.bin" )
|
||||
self.path( "libffmpegsumo.so" )
|
||||
|
||||
with self.prefix(src=os.path.join(os.pardir, 'packages', 'resources'), dst="bin"):
|
||||
|
|
@ -2159,7 +2163,7 @@ class LinuxManifest(ViewerManifest):
|
|||
[os.path.join(self.get_dst_prefix(), dir) for dir in ('bin', 'lib')] +
|
||||
# <FS:Ansariel> Remove VMP
|
||||
#['-type', 'f', '!', '-name', '*.py', '!', '-name', 'SL_Launcher',
|
||||
['-type', 'f', '!',
|
||||
['-type', 'f', "!", "-name", "*.dat", "!", "-name", "*.pak", "!", "-name", "*.bin",
|
||||
# </FS:Ansariel> Remove VMP
|
||||
'!', '-name', 'update_install', '-exec', 'strip', '-S', '{}', ';'])
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue