Melanie 5e1f651e21 Merge branch 'master' into newmultiattach ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

2013-03-18 23:31:27 +00:00

..

Agent

minor: remove some mono compiler warnings

2013-02-14 21:29:35 +00:00

Asset

Don't allow exceptions to propogate from FlotsamAssetCache which may occur when deleting expired files or stamping the region status file.

2013-02-08 21:21:20 +00:00

Avatar

Merge branch 'master' into newmultiattach

2013-03-18 23:31:27 +00:00

Framework

Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object.

2013-03-15 00:49:35 +00:00

Hypergrid

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

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

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Scripting

minor: save some commented out log lines which will be useful again in future debugging of VectorRenderModule

2013-03-13 00:46:17 +00:00

ServiceConnectorsIn

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

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

ServiceConnectorsOut

Add code for testing event queue messages recevied on region cross.

2013-03-06 23:06:00 +00:00

World

Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()

2013-03-14 22:56:26 +00:00