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

..

Handlers

Merge branch 'avination' into careminster

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

Caps.cs

Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.

2011-11-24 21:27:35 +00:00

CapsHandlers.cs

properly lock CapsHandlers.m_capsHandlers

2011-12-07 14:55:01 +00:00

LLSD.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDArray.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDAssetUploadComplete.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDAssetUploadRequest.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDAssetUploadResponse.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDCapEvent.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDEmpty.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDEnvironmentSettings.cs

Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite

2012-05-23 17:04:19 -04:00

LLSDHelpers.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDInventoryFolder.cs

As with LLSDInventoryItem from commit 01a2b0b, send type values in LLSDInventoryFolder for inventory CAPs as integers rather than strings.

2012-06-20 02:28:00 +01:00

LLSDInventoryItem.cs

Fix various issues with http inventory

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

LLSDItemUpdate.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDMapLayer.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDMapLayerResponse.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDMapRequest.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDMethod.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDMethodString.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDParcelVoiceInfoResponse.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDRemoteParcelResponse.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDStreamHandler.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

LLSDTaskInventoryUploadComplete.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDTaskScriptUpdate.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDTaskScriptUploadComplete.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDTest.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDType.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00

LLSDVoiceAccountResponse.cs

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00