Melanie 26d89777d8 Merge branch 'avination' into careminster ... Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-07-06 20:51:18 +01:00
..
BunchOfCaps	Merge branch 'master' into careminster	2012-05-10 00:42:10 +01:00
EventQueue	Merge branch 'avination' into careminster	2012-07-06 20:51:18 +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	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
MeshUploadFlagModule.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
NewFileAgentInventoryVariablePriceModule.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
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	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
WebFetchInvDescModule.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