Melanie 6386fdcda7 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs

2012-02-25 16:24:01 +00:00

..

Application

Merge branch 'master' into careminster

2012-01-31 20:53:49 +00:00

ClientStack

Merge branch 'master' into careminster

2012-02-24 09:56:06 +00:00

CoreModules

Merge branch 'master' into careminster

2012-02-25 16:24:01 +00:00

DataSnapshot

Commenting out DataSnapShot message "Registering service discovery capability" for now.

2012-01-05 17:10:38 +00:00

Framework

Merge branch 'master' into careminster

2012-02-24 09:56:06 +00:00

OptionalModules

Merge branch 'master' into careminster

2012-02-24 09:56:06 +00:00

Physics

Merge branch 'master' into careminster

2012-02-24 09:56:06 +00:00

RegionCombinerModule

Merge branch 'master' into careminster

2011-12-18 10:49:45 +00:00

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

2012-02-25 16:24:01 +00:00

UserStatistics

Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.

2012-02-23 23:11:47 +00:00