Melanie 3589acdab1 Merge branch 'master' into careminster ...

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2013-11-23 19:13:22 +00: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-11-23 19:13:22 +00:00

LoadImageURL

refactor: replace verbose checks with String.IsNullOrEmpty where applicable.

2013-11-15 21:45:08 +00:00

LSLHttp

Merge branch 'master' into careminster

2013-07-24 03:50:09 +01:00

ScriptModuleComms

Merge branch 'master' into careminster

2013-08-11 17:31:25 +01:00

VectorRender

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00

WorldComm

Merge branch 'master' into careminster

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

XMLRPC

refactor: replace verbose checks with String.IsNullOrEmpty where applicable.

2013-11-15 21:45:08 +00:00