Melanie f567ff9f51 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-02-06 02:22:12 +00:00
..
Library	…
Physics	Merge branch 'master' into careminster	2012-03-29 00:27:35 +01:00
Regions	Add config option to Regions.ini for new maptile feature	2013-01-30 23:41:32 -05:00
addon-modules	Add back the missing bin/addon-modules directory that I somehow managed to accidentally delete in 2fbc98f (Jul 7 2011)	2011-10-14 23:32:15 +01:00
assets	Merge branch 'master' into careminster	2012-10-26 21:13:01 +01:00
config-include	Added missing config var in grided sims.	2012-12-07 12:38:19 -08:00
data	Add JSONification of WebStats module. Adds a '?json' query parameter	2013-01-24 10:44:57 -08:00
inventory	Correct asset id of library default iris texture.	2011-09-23 21:57:52 +01:00
lib32	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
lib64	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
openmetaverse_data	Add openmetaverse_data from libopenmetaverse to allow testing of texture baking via bot rather than just throwing out errors	2012-09-18 23:57:00 +01:00
Axiom.MathLib.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
BulletXNA.dll	* Repairs the Object updates, Collision updates, and Child Prim methods making the bulletXNA engine work again.	2013-01-24 07:11:32 -05:00
BulletXNA.pdb	* Repairs the Object updates, Collision updates, and Child Prim methods making the bulletXNA engine work again.	2013-01-24 07:11:32 -05:00
C5.dll	Update C5.dll to version 1.1.1 from 1.1.0	2012-01-03 20:22:15 +00:00
CSJ2K.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
Community.CsharpSqlite.Sqlite.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
Community.CsharpSqlite.Sqlite.pdb	* Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode.	2010-09-23 00:50:18 -04:00
Community.CsharpSqlite.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
Community.CsharpSqlite.pdb	* Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode.	2010-09-23 00:50:18 -04:00
CookComputing.XmlRpcV2.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
DotNetOpenId.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
DotNetOpenMail.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
GlynnTucker.Cache.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
HttpServer_OpenSim.dll	Update the Http server with a few additional properties. Adapt the test	2012-09-27 18:27:49 +01:00
HttpServer_OpenSim.pdb	Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.	2011-11-18 22:52:59 +00:00
HttpServer_OpenSim.xml	Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.	2011-11-18 22:52:59 +00:00
Ionic.Zip.dll	Update OpenMetaverse libraries at commit 6212cbd, this time built on Windows	2012-07-27 23:05:17 +01:00
LaunchSLClient.ini	…
Mono.Addins.CecilReflector.dll	Update mono addins	2012-12-13 00:05:34 -05:00
Mono.Addins.Setup.dll	Update mono addins	2012-12-13 00:05:34 -05:00
Mono.Addins.dll	Update mono addins	2012-12-13 00:05:34 -05:00
Mono.Addins.dll.config	…
Mono.Data.Sqlite.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
Mono.Data.Sqlite.dll.config	Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.	2012-02-25 03:25:56 +00:00
Mono.Data.SqliteClient.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
MsgPack.dll	Add a message packing library to binary-pack AgentCircuitData for faster	2011-05-17 22:38:45 +02:00
MySql.Data.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
NDesk.Options.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
Nini.dll	Make fix to Nini for null references in some cases.	2011-11-29 22:25:03 -05:00
Ode.NET.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
Ode.NET.dll.config	Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.	2012-02-25 03:25:56 +00:00
OpenMetaverse.Http.XML	…
OpenMetaverse.Rendering.Meshmerizer.dll	Update libopenmetaverse components to commit f5cecaa	2012-09-18 23:45:06 +01:00
OpenMetaverse.StructuredData.XML	Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.	2012-06-08 03:25:51 +02:00
OpenMetaverse.StructuredData.dll	Update libopenmetaverse components to commit f5cecaa	2012-09-18 23:45:06 +01:00
OpenMetaverse.XML	Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.	2012-06-08 03:25:51 +02:00
OpenMetaverse.dll	Update libopenmetaverse components to commit f5cecaa	2012-09-18 23:45:06 +01:00
OpenMetaverse.dll.config	fix openjpeg on 64 bit OSX we were pointing to a file taht did not	2012-12-06 09:52:18 -07:00
OpenMetaverseTypes.XML	Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.	2012-06-08 03:25:51 +02:00
OpenMetaverseTypes.dll	Update libopenmetaverse components to commit f5cecaa	2012-09-18 23:45:06 +01:00
OpenSim.32BitLaunch.exe	…
OpenSim.32BitLaunch.exe.config	…
OpenSim.32BitLaunch.pdb	…
OpenSim.ConsoleClient.exe.config	…
OpenSim.ConsoleClient.ini.example	…
OpenSim.Services.exe.config	…
OpenSim.addin.xml	…
OpenSim.exe.config	Independently control logging for per region module loading. I just got sick of, when debugging, the zillions of log lines verifying that each module is being added to each region.	2012-12-13 16:31:53 -08:00
OpenSim.ini.example	Merge branch 'master' into careminster	2013-02-04 19:21:39 +00:00
OpenSimDefaults.ini	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
OpenSimDefaults.ini.example	Renamed OpenSimDefaults.ini.example to OpenSimDefaults.ini	2010-09-13 16:23:22 -07:00
OpenSimExport.exe.config	…
Prebuild.exe	Replace old Prebuild.exe accidentally added back in f977291 with one built without <copy> nant target generation and on mono 2.4.3	2012-11-14 02:44:10 +00:00
PrimMesher.dll	remove default values from prior commit since mono cant deal with them	2012-05-07 00:08:56 -07:00
Robust.32BitLaunch.exe	Compiled Robust.32BitLaunch.exe to .Net 3.5	2010-07-03 10:40:33 -07:00
Robust.32BitLaunch.exe.config	…
Robust.HG.ini.example	Move setting to correct locations in ini	2012-12-12 17:11:30 -05:00
Robust.exe.config	adding -logconfig to Robust.exe	2010-10-01 05:42:18 +01:00
Robust.ini.example	Move setting to correct locations in ini	2012-12-12 17:11:30 -05:00
SimpleApp.exe.config	…
Tools.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
Warp3D.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
XMLRPC.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
avatar-texture.dat	…
defaultstripe.png	…
excuses	…
http_404.html.example	…
http_500.html.example	…
http_loginform.html.example	…
log4net.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
nunit.framework.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00
openjpeg-dotnet-x86_64.dll	Add back openjpeg dll for Windows	2012-12-08 17:15:35 -05:00
openjpeg-dotnet.dll	Add back openjpeg dll for Windows	2012-12-08 17:15:35 -05:00
opensim-ode.sh	…
pCampBot.exe.config	Update libopenmetaverse components to commit f5cecaa	2012-09-18 23:45:06 +01:00
pCampBotSentences.txt	…
shutdown_commands.txt.example	Move startup/shutdown command .txt files to .txt.example files to avoid clobbering on updates.	2012-03-19 00:29:02 +00:00
startup_commands.txt.example	Move startup/shutdown command .txt files to .txt.example files to avoid clobbering on updates.	2012-03-19 00:29:02 +00:00
startuplogo.txt	Remove STARTUP COMPLETE message from the startuplogo.txt file and into main logging	2012-06-20 01:06:55 +01:00
zlib.net.dll	add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows	2011-04-27 23:57:26 +01:00