Melanie 8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs

2011-10-11 21:28:23 +01:00

..

Application.cs

Temporarily put in a log line which shows which locale the user is running in.

2011-07-29 23:43:35 +01:00

ConfigurationLoader.cs

Make default serverside_object_permissions = true since this better matches user expectations.

2011-07-01 23:06:46 +01:00

IApplicationPlugin.cs

* minor: Comments

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

OpenSim.cs

Bring us up to date.

2011-09-14 19:11:32 -07: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 commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

2011-10-11 21:28:23 +01:00