Melanie 7cf377fff0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs

2013-04-10 13:20:55 +01:00

..

DynamicTexture

Fix issues with the DynamicTextureModule and corresponding unit tests.

2012-11-11 19:39:21 -08:00

EMailModules

One more module converted: EmailModule.

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

HttpRequest

Merge branch 'master' into careminster

2013-04-10 13:20:55 +01:00

LoadImageURL

Fix issues with the DynamicTextureModule and corresponding unit tests.

2012-11-11 19:39:21 -08:00

LSLHttp

Merge branch 'avination' into careminster

2013-03-03 13:24:37 +00:00

ScriptModuleComms

Merge branch 'avination' into careminster

2013-03-06 00:15:54 +00:00

VectorRender

Merge branch 'master' into careminster

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

WorldComm

Merge branch 'master' into careminster

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

XMLRPC

* Handle null check on configs in module startup so that the the code can be run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...

2013-02-14 18:52:11 -05:00