Melanie 43128c9016 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-01-14 06:09:19 +00:00

..

Access

minor: change login enable/disable messages in last commit so that they occur after the setting has been made

2011-08-12 22:50:58 +01:00

Archiver

Merge branch 'master' into careminster

2012-01-14 06:09:19 +00:00

Cloud

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

Estate

Remove a debug spam

2011-12-27 01:40:44 +01:00

Land

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

LegacyMap

minor: a little bit of log message correction/commenting out

2011-08-11 03:07:41 +01:00

Media/Moap

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Objects/BuySell

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

Permissions

Merge branch 'master' into careminster

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

Region

Merge branch 'master' into careminster-presence-refactor

2011-05-14 21:09:52 +01:00

Serialiser

rename TestHelper => TestHelpers for consistency

2011-08-06 00:31:03 +01:00

Sound

Rename ForEachAvatar back to ForEachScenePresence. The other changes

2011-11-03 17:53:51 -07:00

Sun

Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to

2011-11-03 17:06:08 -07:00

Terrain

Merge branch 'master' into bigmerge

2011-11-19 22:39:15 +00:00

Tests

…

Vegetation

Fix a bug preventing region modules from creating trees at anything but the default scale.

2011-08-13 00:52:32 +01:00

Warp3DMap

match water color for warp3d map tiler and adjust lighting

2011-06-13 12:37:43 +01:00

Wind

Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to

2011-11-03 17:06:08 -07:00

WorldMap

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00