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

Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs

2012-01-02 21:41:36 +00:00

..

DynamicTexture

Fix CHANGED_TEXTURE and CHANGED_COLOR.

2011-12-05 19:01:14 +00:00

EMailModules

Comment out some startup logging lines to make up for the one I added earlier on.

2011-04-02 02:29:42 +01:00

HttpRequest

Merge branch 'master' into careminster

2012-01-02 21:41:36 +00:00

LoadImageURL

Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.

2011-09-24 01:59:02 +01:00

LSLHttp

Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge

2011-12-08 03:24:25 +00:00

VectorRender

Get some hopefully more useful exception information when OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules

2011-11-02 18:40:49 +00:00

WorldComm

Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance.

2011-11-02 20:05:31 +00:00

XMLRPC

minor: Print out port that http servers are using

2010-03-25 21:36:57 +00:00