Melanie 7dad1ded2e Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs		2012-03-29 00:27:35 +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	Merge branch 'master' into careminster	2011-12-14 08:57:55 +00:00
config-include	User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.	2012-03-27 22:09:58 +02:00
data	Thank you, Intimidated, for a patch too fix the movement animation handling	2009-04-06 10:44:41 +00:00
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	…
C5.dll	Update C5.dll to version 1.1.1 from 1.1.0	2012-01-03 20:22:15 +00:00
CSJ2K.dll	…
Community.CsharpSqlite.Sqlite.dll	…
Community.CsharpSqlite.Sqlite.pdb	…
Community.CsharpSqlite.dll	…
Community.CsharpSqlite.pdb	…
CookComputing.XmlRpcV2.dll	…
DotNetOpenId.dll	…
DotNetOpenMail.dll	…
GlynnTucker.Cache.dll	…
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
LaunchSLClient.ini	…
Mono.Addins.CecilReflector.dll	…
Mono.Addins.Setup.dll	…
Mono.Addins.dll	…
Mono.Addins.dll.config	…
Mono.Data.Sqlite.dll	…
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	…
MySql.Data.dll	…
NDesk.Options.dll	…
Newtonsoft.Json.Net20.dll	…
Newtonsoft.Json.XML	…
Newtonsoft.Json.pdb	Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6	2010-03-11 21:04:56 +00:00
Nini.dll	Make fix to Nini for null references in some cases.	2011-11-29 22:25:03 -05:00
Ode.NET.dll	…
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 libomv to 0.9.1	2011-12-07 09:56:15 -05:00
OpenMetaverse.StructuredData.XML	…
OpenMetaverse.StructuredData.dll	Update libomv to 0.9.1	2011-12-07 09:56:15 -05:00
OpenMetaverse.XML	…
OpenMetaverse.dll	Update libomv to 0.9.1	2011-12-07 09:56:15 -05:00
OpenMetaverse.dll.config	Move libopenjpeg native libraries into lib32 and lib64 as appropriate.	2012-02-25 04:26:32 +00:00
OpenMetaverseTypes.XML	…
OpenMetaverseTypes.dll	Update libomv to 0.9.1	2011-12-07 09:56:15 -05:00
OpenSim.32BitLaunch.exe	…
OpenSim.32BitLaunch.exe.config	…
OpenSim.32BitLaunch.pdb	…
OpenSim.ConsoleClient.exe.config	…
OpenSim.ConsoleClient.ini.example	* Add extra warning about using -pass in OpenSim.ConsoleClient.ini.example	2009-09-03 20:00:18 +01:00
OpenSim.Framework.Serialization.Tests.dll.config	Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.	2012-02-03 22:21:54 +00:00
OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config	Add new EventQueueTests with basic test to check that adding a client registers an http poll	2011-10-24 22:23:41 +01:00
OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config	Reactivate BasicCircuitTests.TestAddClient()	2011-12-08 20:52:34 +00:00
OpenSim.Region.OptionalModules.Tests.dll.config	…
OpenSim.Services.exe.config	…
OpenSim.Tests.Torture.dll.config	Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.	2012-01-31 19:56:37 +00:00
OpenSim.addin.xml	…
OpenSim.exe.config	Comment out noisy log lines I accidentally included in the nant build target adjustment commit.	2012-01-16 23:04:08 +00:00
OpenSim.ini.example	Added new simple_build_permissions config to the .ini and .example files.	2012-03-22 14:21:07 -07:00
OpenSimDefaults.ini	Merge branch 'master' into careminster	2012-03-27 23:14:43 +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	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
RegionConfig.ini.example	…
Robust.32BitLaunch.exe	…
Robust.32BitLaunch.exe.config	…
Robust.HG.ini.example	User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.	2012-03-27 22:09:58 +02:00
Robust.exe.config	…
Robust.ini.example	Fix typo	2012-03-21 20:33:45 -04:00
SimpleApp.exe.config	…
Tools.dll	…
Warp3D.dll	…
XMLRPC.dll	…
avatar-texture.dat	…
defaultstripe.png	…
excuses	…
http_404.html.example	…
http_500.html.example	…
http_loginform.html.example	…
log4net.dll	…
nunit.framework.dll	…
openjpeg-dotnet-x86_64.dll	…
openjpeg-dotnet.dll	…
opensim-ode.sh	…
pCampBot.exe.config	…
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	…
zlib.net.dll	…