Melanie b39de2425c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-04-07 04:52:14 +01:00

..

Access

Change "help" to display categories/module list then "help <category/module>" to display commands in a category.

2012-03-08 01:51:37 +00:00

Archiver

Merge branch 'master' into careminster

2012-03-11 02:29:43 +00:00

Cloud

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

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

Estate

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00

Land

Merge branch 'master' into careminster

2012-04-07 04:52:14 +01: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

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

Permissions

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

Region

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

Serialiser

Turn off logging on test in last commit (2b84295).

2012-02-16 03:02:11 +00:00

Sound

Rename ForEachAvatar back to ForEachScenePresence. The other changes

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

Sun

Change "help" to display categories/module list then "help <category/module>" to display commands in a category.

2012-03-08 01:51:37 +00:00

Terrain

Merge branch 'master' into careminster

2012-04-03 23:52:53 +01:00

Tests

Add copyright headers.

2009-03-07 02:11:50 +00:00

Vegetation

refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.

2012-03-31 01:52:06 +01:00

Warp3DMap

Cache the last maptile and return the cachrd tile if the last request is

2012-03-29 22:34:33 +02:00

Wind

Change "help" to display categories/module list then "help <category/module>" to display commands in a category.

2012-03-08 01:51:37 +00:00

WorldMap

Fixed borkness with map search introduce by my last changes to it.

2012-03-20 17:29:34 -07:00