Melanie d3892bbd06 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2013-02-05 21:30:12 +00:00

..

Handlers

Merge branch 'master' into careminster

2013-02-05 21:30:12 +00:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00: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

try to allow free uploads for testing, if users prefix names with "TEST-". Let

2012-09-23 15:04:10 +01:00

LLSDAssetUploadRequest.cs

removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some

2012-09-22 16:47:15 +01:00

LLSDAssetUploadResponse.cs

report asset upload errors the right away

2012-09-22 21:14:15 +01: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

Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.

2012-07-13 01:03:28 +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