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

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2013-02-05 21:30:12 +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

2013-01-04 22:39:07 +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

2013-01-26 16:58:02 +00:00

Land

Merge branch 'avination' into careminster

2013-01-06 10:52:22 +00:00

LegacyMap

Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead.

2013-02-02 00:59:26 +00:00

LightShare

Merge branch 'master' into careminster

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

Media/Moap

minor: Fix more compiler warnings in CoreModules tests by properly overriding OpenSimTestCase.SetUp()

2012-12-05 23:44:12 +00:00

Objects

Merge branch 'master' into careminster

2013-01-26 01:56:23 +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

Added unit tests for Dynamic Attributes

2013-01-25 04:03:30 +00:00

Sound

Fix sounds so that they play from inventory after teleport rather than only on initial login region.

2012-12-13 01:03:35 +00:00

Sun

Fixed several problems with the Sun: some settings didn't work, or were inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)

2013-01-02 23:16:24 +00:00

Terrain

Merge branch 'master' into careminster

2013-01-04 22:39:07 +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

minor: remove some mono compiler warnings

2012-11-23 04:08:17 +00:00

WorldMap

Merge branch 'master' into careminster

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