Melanie fe4a67efb6 Merge branch 'avination-current' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
	OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
	OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs

2013-06-06 03:20:15 +01:00

..

Access

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

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

Archiver

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

Cloud

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

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

Estate

Send up the part missing from the Avination Estate commit.

2013-05-11 01:27:37 +01:00

Land

Merge branch 'avination-current' into careminster

2013-06-06 03:20:15 +01:00

LegacyMap

Move map related settings from [Startup] to a new [Map] section in OpenSim.ini

2013-02-25 23:04:38 +00:00

LightShare

Allow callers to set the invoice parameter for GenericMessage

2013-04-22 22:39:08 +01: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 commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster

2013-03-29 02:21:06 +00:00

Permissions

Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02:34:51 2013)

2013-04-09 23:21:13 +01: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

Implement llSetSoundQueueing().

2013-05-22 20:01:57 +01: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

2013-02-26 13:34:20 +00:00

Wind

minor: remove some mono compiler warnings

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

WorldMap

Remove dumb "Region found!" message from map search

2013-05-06 06:15:47 +02:00