Melanie 389077345f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

2012-11-11 16:31:01 +00:00

..

DynamicTexture

minor: comment out currently unused logger in DynamicTextureModule

2012-10-19 00:39:18 +01:00

EMailModules

Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing.

2012-05-13 17:34:20 -04:00

HttpRequest

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

LoadImageURL

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

LSLHttp

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

ScriptModuleComms

Add a method to query all registered script constants to allow non-XEngine

2012-11-04 22:39:15 +00:00

VectorRender

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

WorldComm

Merge branch 'master' into careminster

2012-11-11 16:31:01 +00:00

XMLRPC

Make XMLRPCModule use an existing HTTP server if one already exists on the desired port.

2012-06-15 00:59:53 +01:00