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

..

FetchInventory2

Fix various issues with http inventory

2012-06-02 04:57:10 +01:00

GetMesh

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

GetTexture

Merge branch 'avination' into careminster

2012-07-06 20:51:18 +01:00

UploadBakedTexture

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

WebFetchInventoryDescendents

If a link points to a non-existing item in FetchInventory caps, then don't try to add it to the return data rather than suffering an exception later on

2012-06-29 00:11:44 +01:00