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

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2012-06-21 01:10:13 +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-05-27 19:24:30 +01:00

Cloud

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

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

Estate

Merge branch 'avination' into careminster

2012-06-07 23:34:22 +01:00

Land

Merge branch 'master' into careminster

2012-06-08 00:14:39 +01:00

LegacyMap

Changed the Map-related messages from Info to Debug. They're debug messages.

2012-04-23 21:29:18 -07:00

Media/Moap

Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +01:00

Objects

Merge branch 'master' into careminster

2012-05-16 12:40:45 +01:00

Permissions

Merge branch 'master' into careminster

2012-06-21 01:10:13 +01:00

Region

Merge branch 'avination' into careminster

2012-06-07 23:34:22 +01:00

Serialiser

Add regression test for teleporting an agent between separated regions on the same simulator.

2012-04-27 00:58:54 +01:00

Sound

Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private.

2012-06-14 01:20:55 +01: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-06-06 13:07:05 +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

Merge branch 'master' into careminster

2012-06-06 13:07:05 +01: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

Merge branch 'master' into careminster

2012-06-06 13:07:05 +01:00