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

Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs

2012-11-23 03:39:49 +00:00

..

Access

Another 11 modules' directions moved out of .addin.xml

2012-11-13 08:36:44 -08:00

Archiver

Merge branch 'master' into careminster

2012-11-13 10:49:24 +00:00

Cloud

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

Estate

Merge branch 'master' into careminster

2012-11-23 03:39:49 +00:00

Land

Merge branch 'master' into careminster

2012-11-13 10:49:24 +00:00

LegacyMap

Another 11 modules' directions moved out of .addin.xml

2012-11-13 08:36:44 -08:00

LightShare

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

Media/Moap

Add OSSL function osForceAttachToAvatarFromInventory()

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

Objects

Merge branch 'master' into careminster

2012-10-31 21:42:06 +00:00

Permissions

One more module converted: PermissionsModule.

2012-11-11 15:59:09 -08:00

Region

Merge branch 'master' into careminster

2012-11-23 03:39:49 +00:00

Serialiser

Another 10 modules' directives moved from .addin.xml

2012-11-12 21:14:58 -08:00

Sound

refactoring to use assembly:classname style of configuration

2012-10-29 23:39:01 +00:00

Sun

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

Terrain

Merge branch 'master' into careminster

2012-11-13 10:49:24 +00:00

Vegetation

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

Warp3DMap

Merge branch 'master' into careminster

2012-11-13 10:49:24 +00:00

Wind

Moved the WindModule and its own plugins out of .addin.xml

2012-11-12 21:27:23 -08:00

WorldMap

Merge branch 'master' into careminster

2012-11-15 03:46:10 +00:00