Melanie 72c925a6c9 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs

2012-10-18 20:56:34 +01:00

..

BunchOfCaps

Merge branch 'avination' into careminster

2012-10-18 20:56:34 +01:00

EventQueue

Merge branch 'master' into careminster

2012-10-16 04:30:01 +01:00

ObjectCaps

minor: remove unnecessary IsAttachment = false setting for new object in UploadObjectAssetModule, property always starts as false

2012-06-14 00:35:26 +01:00

FetchInventory2Module.cs

Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +01:00

GetMeshModule.cs

Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +01:00

GetTextureModule.cs

Make texture sedning use only two threads to make things less harsh on bandwidth

2012-10-14 17:10:26 +02:00

MeshUploadFlagModule.cs

removed unused data in MeshUploadFlag response

2012-09-22 12:00:14 +01:00

RegionConsoleModule.cs

Merge branch 'avination' into careminster

2012-10-18 20:56:34 +01:00

SimulatorFeaturesModule.cs

Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +01:00

UploadBakedTextureModule.cs

Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket.

2012-08-03 23:02:39 +01:00

WebFetchInvDescModule.cs

just remove the damm thing

2012-09-26 16:17:49 +01:00