Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs |
||
|---|---|---|
| .. | ||
| Handlers | ||
| Caps.cs | ||
| CapsHandlers.cs | ||
| LLSD.cs | ||
| LLSDArray.cs | ||
| LLSDAssetUploadComplete.cs | ||
| LLSDAssetUploadRequest.cs | ||
| LLSDAssetUploadResponse.cs | ||
| LLSDCapEvent.cs | ||
| LLSDEmpty.cs | ||
| LLSDEnvironmentSettings.cs | ||
| LLSDHelpers.cs | ||
| LLSDInventoryFolder.cs | ||
| LLSDInventoryItem.cs | ||
| LLSDItemUpdate.cs | ||
| LLSDMapLayer.cs | ||
| LLSDMapLayerResponse.cs | ||
| LLSDMapRequest.cs | ||
| LLSDMethod.cs | ||
| LLSDMethodString.cs | ||
| LLSDParcelVoiceInfoResponse.cs | ||
| LLSDRemoteParcelResponse.cs | ||
| LLSDStreamHandler.cs | ||
| LLSDTaskInventoryUploadComplete.cs | ||
| LLSDTaskScriptUpdate.cs | ||
| LLSDTaskScriptUploadComplete.cs | ||
| LLSDTest.cs | ||
| LLSDType.cs | ||
| LLSDVoiceAccountResponse.cs | ||