diff options
| author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
| commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
| tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs | |
| parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
| download | opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.xz | |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs index 16547d5..5833b65 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs | |||
| @@ -30,7 +30,7 @@ using OpenMetaverse; | |||
| 30 | 30 | ||
| 31 | namespace OpenSim.Framework.Communications.Capabilities | 31 | namespace OpenSim.Framework.Communications.Capabilities |
| 32 | { | 32 | { |
| 33 | [OSDMap] | 33 | [LLSDMap] |
| 34 | public class LLSDAssetUploadRequest | 34 | public class LLSDAssetUploadRequest |
| 35 | { | 35 | { |
| 36 | public string asset_type = String.Empty; | 36 | public string asset_type = String.Empty; |