diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
23 files changed, 46 insertions, 56 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index c07744c..b6ee04d 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -32,11 +32,10 @@ using System.IO; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
37 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
38 | 37 | ||
39 | namespace OpenSim.Region.Capabilities | 38 | namespace OpenSim.Framework.Communications.Capabilities |
40 | { | 39 | { |
41 | public delegate void UpLoadedAsset( | 40 | public delegate void UpLoadedAsset( |
42 | string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, | 41 | string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, |
@@ -54,8 +53,8 @@ namespace OpenSim.Region.Capabilities | |||
54 | bool isScriptRunning, byte[] data); | 53 | bool isScriptRunning, byte[] data); |
55 | 54 | ||
56 | public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, | 55 | public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, |
57 | bool fetchFolders, bool fetchItems, int sortOrder); | 56 | bool fetchFolders, bool fetchItems, int sortOrder); |
58 | 57 | ||
59 | /// <summary> | 58 | /// <summary> |
60 | /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that | 59 | /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that |
61 | /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want | 60 | /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want |
@@ -397,7 +396,7 @@ namespace OpenSim.Region.Capabilities | |||
397 | /// <returns></returns> | 396 | /// <returns></returns> |
398 | public string RequestTexture(string request, string path, string param) | 397 | public string RequestTexture(string request, string path, string param) |
399 | { | 398 | { |
400 | Console.WriteLine("texture request " + request); | 399 | System.Console.WriteLine("texture request " + request); |
401 | // Needs implementing (added to remove compiler warning) | 400 | // Needs implementing (added to remove compiler warning) |
402 | return String.Empty; | 401 | return String.Empty; |
403 | } | 402 | } |
@@ -961,4 +960,4 @@ namespace OpenSim.Region.Capabilities | |||
961 | } | 960 | } |
962 | } | 961 | } |
963 | } | 962 | } |
964 | } | 963 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs index f101131..e76a5c5 100644 --- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs +++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs | |||
@@ -29,7 +29,7 @@ using System.Collections; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenSim.Framework.Servers; | 30 | using OpenSim.Framework.Servers; |
31 | 31 | ||
32 | namespace OpenSim.Region.Capabilities | 32 | namespace OpenSim.Framework.Communications.Capabilities |
33 | { | 33 | { |
34 | /// <summary> | 34 | /// <summary> |
35 | /// CapsHandlers is a cap handler container but also takes | 35 | /// CapsHandlers is a cap handler container but also takes |
@@ -141,4 +141,4 @@ namespace OpenSim.Region.Capabilities | |||
141 | } | 141 | } |
142 | } | 142 | } |
143 | } | 143 | } |
144 | } | 144 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs index b3e841c..13361c7 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs | |||
@@ -34,7 +34,7 @@ using System.Text; | |||
34 | using System.Xml; | 34 | using System.Xml; |
35 | using libsecondlife; | 35 | using libsecondlife; |
36 | 36 | ||
37 | namespace OpenSim.Region.Capabilities | 37 | namespace OpenSim.Framework.Communications.Capabilities |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code. | 40 | /// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code. |
@@ -676,4 +676,4 @@ namespace OpenSim.Region.Capabilities | |||
676 | } | 676 | } |
677 | } | 677 | } |
678 | } | 678 | } |
679 | } | 679 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs index a5cdd73..3579cc2 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Collections; | 28 | using System.Collections; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDType("ARRAY")] | 32 | [LLSDType("ARRAY")] |
33 | public class LLSDArray | 33 | public class LLSDArray |
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities | |||
38 | { | 38 | { |
39 | } | 39 | } |
40 | } | 40 | } |
41 | } | 41 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs index 1393523..6c4db4b 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | 30 | ||
31 | namespace OpenSim.Region.Capabilities | 31 | namespace OpenSim.Framework.Communications.Capabilities |
32 | { | 32 | { |
33 | [LLSDType("MAP")] | 33 | [LLSDType("MAP")] |
34 | public class LLSDAssetUploadComplete | 34 | public class LLSDAssetUploadComplete |
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities | |||
42 | { | 42 | { |
43 | } | 43 | } |
44 | } | 44 | } |
45 | } | 45 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs index e71a73e..289cc93 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | 30 | ||
31 | namespace OpenSim.Region.Capabilities | 31 | namespace OpenSim.Framework.Communications.Capabilities |
32 | { | 32 | { |
33 | [LLSDMap] | 33 | [LLSDMap] |
34 | public class LLSDAssetUploadRequest | 34 | public class LLSDAssetUploadRequest |
@@ -43,4 +43,4 @@ namespace OpenSim.Region.Capabilities | |||
43 | { | 43 | { |
44 | } | 44 | } |
45 | } | 45 | } |
46 | } | 46 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs index bb293ba..63b3351 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [LLSDMap] |
33 | public class LLSDAssetUploadResponse | 33 | public class LLSDAssetUploadResponse |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs index c1b15b4..5ff21b8 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Framework.Communications.Capabilities |
29 | { | 29 | { |
30 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
31 | public class LLSDCapEvent | 31 | public class LLSDCapEvent |
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities | |||
37 | { | 37 | { |
38 | } | 38 | } |
39 | } | 39 | } |
40 | } | 40 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs index 5a44e26..4abdb59 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Framework.Communications.Capabilities |
29 | { | 29 | { |
30 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
31 | public class LLSDEmpty | 31 | public class LLSDEmpty |
@@ -34,4 +34,4 @@ namespace OpenSim.Region.Capabilities | |||
34 | { | 34 | { |
35 | } | 35 | } |
36 | } | 36 | } |
37 | } | 37 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs index a39f5aa..409d2e0 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |||
@@ -31,7 +31,7 @@ using System.IO; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | 33 | ||
34 | namespace OpenSim.Region.Capabilities | 34 | namespace OpenSim.Framework.Communications.Capabilities |
35 | { | 35 | { |
36 | public class LLSDHelpers | 36 | public class LLSDHelpers |
37 | { | 37 | { |
@@ -160,4 +160,4 @@ namespace OpenSim.Region.Capabilities | |||
160 | return obj; | 160 | return obj; |
161 | } | 161 | } |
162 | } | 162 | } |
163 | } | 163 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index d402579..31896c2 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [LLSDMap] |
33 | public class LLSDInventoryItem | 33 | public class LLSDInventoryItem |
@@ -68,15 +68,6 @@ namespace OpenSim.Region.Capabilities | |||
68 | public string sale_type; | 68 | public string sale_type; |
69 | } | 69 | } |
70 | 70 | ||
71 | /* [LLSDMap] | ||
72 | public class LLSDFolderItem | ||
73 | { | ||
74 | public LLUUID folder_id; | ||
75 | public LLUUID parent_id; | ||
76 | public int type; | ||
77 | public string name; | ||
78 | }*/ | ||
79 | |||
80 | [LLSDMap] | 71 | [LLSDMap] |
81 | public class LLSDInventoryDescendents | 72 | public class LLSDInventoryDescendents |
82 | { | 73 | { |
@@ -103,4 +94,4 @@ namespace OpenSim.Region.Capabilities | |||
103 | public LLUUID owner___id; // and of course we can't have field names with "-" in | 94 | public LLUUID owner___id; // and of course we can't have field names with "-" in |
104 | public int version; | 95 | public int version; |
105 | } | 96 | } |
106 | } | 97 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs index 6211c4f..2c4b68f 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [LLSDMap] |
33 | public class LLSDItemUpdate | 33 | public class LLSDItemUpdate |
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities | |||
38 | { | 38 | { |
39 | } | 39 | } |
40 | } | 40 | } |
41 | } | 41 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs index 0cf82a8..50f5241 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDType("MAP")] | 32 | [LLSDType("MAP")] |
33 | public class LLSDMapLayer | 33 | public class LLSDMapLayer |
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities | |||
42 | { | 42 | { |
43 | } | 43 | } |
44 | } | 44 | } |
45 | } | 45 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs index 205a645..7dabbec 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Framework.Communications.Capabilities |
29 | { | 29 | { |
30 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
31 | public class LLSDMapLayerResponse | 31 | public class LLSDMapLayerResponse |
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities | |||
37 | { | 37 | { |
38 | } | 38 | } |
39 | } | 39 | } |
40 | } | 40 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs index 748c5ea..317e35d 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Framework.Communications.Capabilities |
29 | { | 29 | { |
30 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
31 | public class LLSDMapRequest | 31 | public class LLSDMapRequest |
@@ -36,4 +36,4 @@ namespace OpenSim.Region.Capabilities | |||
36 | { | 36 | { |
37 | } | 37 | } |
38 | } | 38 | } |
39 | } | 39 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs index deb9223..55d62ac 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Framework.Communications.Capabilities |
29 | { | 29 | { |
30 | public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request); | 30 | public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request); |
31 | } | 31 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs index 4439346..fb5eaa8 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | using System.Collections; | 29 | using System.Collections; |
30 | 30 | ||
31 | namespace OpenSim.Region.Capabilities | 31 | namespace OpenSim.Framework.Communications.Capabilities |
32 | { | 32 | { |
33 | [LLSDMap] | 33 | [LLSDMap] |
34 | public class LLSDParcelVoiceInfoResponse | 34 | public class LLSDParcelVoiceInfoResponse |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs index 545643a..5e8a08f 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs | |||
@@ -30,7 +30,7 @@ using System.IO; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenSim.Framework.Servers; | 31 | using OpenSim.Framework.Servers; |
32 | 32 | ||
33 | namespace OpenSim.Region.Capabilities | 33 | namespace OpenSim.Framework.Communications.Capabilities |
34 | { | 34 | { |
35 | public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler | 35 | public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler |
36 | where TRequest : new() | 36 | where TRequest : new() |
@@ -65,4 +65,4 @@ namespace OpenSim.Region.Capabilities | |||
65 | return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); | 65 | return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); |
66 | } | 66 | } |
67 | } | 67 | } |
68 | } | 68 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs index 22e45f4..ee9ff1b 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [LLSDMap] |
33 | public class LLSDTaskInventoryUploadComplete | 33 | public class LLSDTaskInventoryUploadComplete |
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities | |||
47 | /// </summary> | 47 | /// </summary> |
48 | public string state; | 48 | public string state; |
49 | } | 49 | } |
50 | } | 50 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs index ed7e824..df32d1a 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [LLSDMap] |
33 | public class LLSDTaskScriptUpdate | 33 | public class LLSDTaskScriptUpdate |
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities | |||
47 | /// </summary> | 47 | /// </summary> |
48 | public int is_script_running; | 48 | public int is_script_running; |
49 | } | 49 | } |
50 | } | 50 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs index d050176..91db060 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Framework.Communications.Capabilities |
29 | { | 29 | { |
30 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
31 | public class LLSDTest | 31 | public class LLSDTest |
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities | |||
37 | { | 37 | { |
38 | } | 38 | } |
39 | } | 39 | } |
40 | } | 40 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs index bdc8e79..181a465 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [AttributeUsage(AttributeTargets.Class)] | 32 | [AttributeUsage(AttributeTargets.Class)] |
33 | public class LLSDType : Attribute | 33 | public class LLSDType : Attribute |
@@ -52,4 +52,4 @@ namespace OpenSim.Region.Capabilities | |||
52 | { | 52 | { |
53 | } | 53 | } |
54 | } | 54 | } |
55 | } | 55 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs index 941e70e..67064b0 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | namespace OpenSim.Region.Capabilities | 29 | namespace OpenSim.Framework.Communications.Capabilities |
30 | { | 30 | { |
31 | [LLSDMap] | 31 | [LLSDMap] |
32 | public class LLSDVoiceAccountResponse | 32 | public class LLSDVoiceAccountResponse |