Melanie bf565e9747 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-10-03 17:40:11 +01:00

..

Application

Add using clause I missed

2012-09-30 15:57:49 +01:00

ClientStack

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

CoreModules

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00

DataSnapshot

minor: resolve some mono compiler warnings

2012-05-03 01:56:24 +01:00

Framework

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00

OptionalModules

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

Physics

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00

RegionCombinerModule

Move addin attributes to RegionCombinerModule.addin.xml

2012-09-07 13:21:06 -04:00

ReplaceableModules

…

ScriptEngine

Merge branch 'avination' into careminster

2012-10-03 17:40:11 +01:00

UserStatistics

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00