Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor ...

This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.

2010-01-16 00:05:08 +00:00

..

Application.cs

Checks the number of ThreadPool and IOCP threads on startup and bumps up the numbers to .NET defaults of 500/1000 if need be

2009-10-06 15:51:56 -07:00

ConfigurationLoader.cs

switch default physics engine to ODE and default meshmerizer to Meshmerizer in code and in OpenSim.ini.example

2009-09-16 18:44:55 +01:00

HGCommands.cs

* General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.

2010-01-15 15:11:58 -08:00

IApplicationPlugin.cs

* minor: Comments

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

OpenSim.cs

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +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 presence-refactor

2010-01-16 00:05:08 +00:00