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

Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-04-24 21:30:12 +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-04-23 20:44:41 +01: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-04-17 01:54:54 +01:00

Land

Merge branch 'master' into careminster

2012-04-17 01:54:54 +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 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-04-18 20:09:52 +01:00

Permissions

Merge branch 'master' into careminster

2012-04-17 01:54:54 +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

Improve bitmap disposal to do null checks and not to potentially try disposal of uninitialized variables.

2012-04-20 23:35:11 +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

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

2012-04-23 21:29:18 -07: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