Melanie 3589acdab1 Merge branch 'master' into careminster ...

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2013-11-23 19:13:22 +00:00

..

Application.cs

minor: Consistently log IOCP for IO completion thread startup log information instead of mixing this with "IO Completion Threads"

2013-08-09 18:27:26 +01:00

ConfigurationLoader.cs

Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section.

2013-10-28 18:03:34 +00:00

IApplicationPlugin.cs

* minor: Comments

2009-08-12 22:54:57 -04:00

OpenSim.cs

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00

OpenSimBackground.cs

Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet

2009-10-09 02:10:53 -07:00

OpenSimBase.cs

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00