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

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

2012-03-21 00:26:02 +00: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

fix compile error from last commit

2012-03-21 00:31:31 +00:00

Land

Merge branch 'master' into careminster

2012-03-18 20:44:56 +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

Merge branch 'master' into careminster

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

Permissions

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00: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-03-18 20:44:56 +00:00

Tests

Add copyright headers.

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

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

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-03-21 00:26:02 +00:00