Merge git://github.com/AlericInglewood/SingularityViewer

Conflicts:
	indra/newview/skins/default/xui/en-us/mime_types.xml
This commit is contained in:
Siana Gearz
2011-05-08 19:39:32 +02:00
178 changed files with 2242 additions and 1971 deletions

View File

@@ -162,26 +162,12 @@
<string>artwork</string>
<key>packages</key>
<map>
<key>darwin</key>
<key>common</key>
<map>
<key>md5sum</key>
<string>5e047437d73d1017bf270a6c6e936f23</string>
<string>a2cde4f24bdcc260b661e139846b8acd</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>5e047437d73d1017bf270a6c6e936f23</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>5e047437d73d1017bf270a6c6e936f23</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
<uri>http://imprudenceviewer.org/download/libs/imprudence-artwork-20101026.tar.bz2</uri>
</map>
</map>
</map>
@@ -374,39 +360,6 @@
</map>
</map>
</map>
<key>fmod</key>
<map>
<key>copyright</key>
<string>FMOD Sound System, copyright (C) Firelight Technologies Pty, Ltd., 1994-2006.</string>
<key>description</key>
<string>Audio engine and mp3 stream decoder .</string>
<key>license</key>
<string>fmod</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>c7e317bec481b7efa2a0319e163dcc65</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-darwin-20080818.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>abd2b4ba4ac993f19d82804af387eb7c</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-20080818.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>1a55dec2907821f5f785648a660126c3</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-windows-20080611.tar.bz2</uri>
</map>
</map>
</map>
<key>fontconfig</key>
<map>
<key>license</key>
@@ -1015,35 +968,6 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
<key>mysql</key>
<map>
<key>license</key>
<string>gpl</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>df27f2db244ea2762759a06cd75ada4e</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysql-darwin-20080812.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>cc86b4cc858655e23704d1168325d7b9</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysqlclient-linux-20090320.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>98bac06680dca907e783d8dd4aa9edde</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysql-windows-20080804.tar.bz2</uri>
</map>
</map>
</map>
<key>ndofdev</key>
<map>
<key>copyright</key>
@@ -1219,58 +1143,6 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
<key>quicktime</key>
<map>
<key>copyright</key>
<string>Copyright (C) 1990-2007 by Apple Computer, Inc., all rights reserved.</string>
<key>description</key>
<string>Separate download. Used to play in-world video clips on a prim. </string>
<key>license</key>
<string>quicktime</string>
<key>packages</key>
<map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>be45825cc14ede53790ac93c58307dcb</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/quicktime-sdk-windows-7.3-20091110.tar.bz2</uri>
</map>
</map>
</map>
<key>smartheap</key>
<map>
<key>copyright</key>
<string>Copyright (C) 1991-2000 Compuware Corporation. All Rights Reserved.</string>
<key>description</key>
<string>Memory Management Library</string>
<key>license</key>
<string>smartheap</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>f54131b5f228e805c64c2e4e6c96579a</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-darwin-20080610.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>499208522bf7d7843e1d014d64214e06</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-linux-20080610.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>78fd47017f21d11eae43bca3e38a3e1e</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-windows-20080611.tar.bz2</uri>
</map>
</map>
</map>
<key>tut</key>
<map>
<key>copyright</key>
@@ -1331,6 +1203,13 @@ anguage Infrstructure (CLI) international standard</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>01573510dce7f380f44e561ef2f3dd9f</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
@@ -1340,6 +1219,29 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
<key>32bitcompatibilitylibs</key>
<map>
<key>copyright</key>
<string>Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
Simon Josefsson. License GPL v3.0.
Freealut, libuuid, openal-soft: see copyright and license of the
according main packages.
</string>
<key>description</key>
<string>32bit libraries needed for using voice</string>
<key>license</key>
<string>gpl</string>
<key>packages</key>
<map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>cbaafc55fb8b14283541791e82f13462</string>
<key>url</key>
<uri>http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2</uri>
</map>
</map>
</map>
<key>xmlrpc-epi</key>
<map>
<key>copyright</key>