Melanie fd22159d0c Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Framework/Watchdog.cs

2011-10-26 01:27:24 +01:00

..

DynamicTexture

meaningless change to goose panda

2011-10-11 00:29:41 +01: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

Fix the cert validation handler so that it will not block other parts of

2011-05-13 12:02:49 +01: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 branch 'master' into bigmerge

2011-10-26 01:27:24 +01:00

VectorRender

Normalization of OSSL function names.

2010-12-10 22:20:35 +01:00

WorldComm

Try disabling the inconsistent attachment state check to see if this actually has an impact.

2011-09-05 23:42:37 +01:00

XMLRPC

minor: Print out port that http servers are using

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