Melanie 7cc5b3d7d3 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs		2012-06-26 17:35:55 +01:00
..
Library	…
Physics	Merge branch 'master' into careminster	2012-03-29 00:27:35 +01:00
Regions	…
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	Add collision sounds to the asset set	2012-06-07 23:35:08 +01:00
config-include	Remove profile from basic configuration	2012-06-04 18:24:02 +01:00
data	…
inventory	Correct asset id of library default iris texture.	2011-09-23 21:57:52 +01:00
lib32	BulletSim: update 64 bit libraries and change Linux configuration to use the files in the lib32 and lib64 directories as needed.	2012-03-28 15:36:20 -07:00
lib64	BulletSim: update 64 bit libraries and change Linux configuration to use the files in the lib32 and lib64 directories as needed.	2012-03-28 15:36:20 -07: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
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	…
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	…
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	Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.	2011-11-18 22:52:59 +00: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	Allow use of regular expressions in "show object name", "show part name" and "delete object name" console commands if --regex switch is used.	2012-05-15 23:42:49 +01:00
LaunchSLClient.ini	…
Mono.Addins.CecilReflector.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.Addins.Setup.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.Addins.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.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
Newtonsoft.Json.Net20.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
Newtonsoft.Json.XML	…
Newtonsoft.Json.pdb	…
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	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.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	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.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	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.config	Move libopenjpeg native libraries into lib32 and lib64 as appropriate.	2012-02-25 04:26:32 +00: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	Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.	2012-06-08 03:25:51 +02: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	If starting scripts on initial sim start, provide INFO level log feedback each time 50 scripts have been started.	2012-06-22 02:10:27 +01:00
OpenSim.ini.example	Provide Telehub setting to allow use of landmarks	2012-05-18 17:51:38 -04:00
OpenSimDefaults.ini	Merge branch 'master' into careminster	2012-06-21 01:10:13 +01:00
OpenSimDefaults.ini.example	…
OpenSimExport.exe.config	…
Prebuild.exe	Add Copy task to Prebuild.exe (vsxxxx targets)	2011-12-25 00:04:42 -05:00
PrimMesher.dll	remove default values from prior commit since mono cant deal with them	2012-05-07 00:08:56 -07:00
RegionConfig.ini.example	Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.	2011-04-23 00:40:08 +01:00
Robust.32BitLaunch.exe	…
Robust.32BitLaunch.exe.config	…
Robust.HG.ini.example	Oops! putting back the entry for map urls	2012-06-16 07:26:16 -04:00
Robust.exe.config	adding -logconfig to Robust.exe	2010-10-01 05:42:18 +01:00
Robust.ini.example	Adjust Robust*.ini.examples V3 webprofile entries	2012-06-16 06:29:15 -04: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 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.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
opensim-ode.sh	…
pCampBot.exe.config	Add millisecond logging to pCampBot for debugging purposes	2012-05-18 03:44:31 +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