diff options
author | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
commit | f518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch) | |
tree | 8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Framework/Communications | |
parent | Reverting the texture sending patch and the new libOMV. This makes this (diff) | |
download | opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2 opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz |
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to '')
19 files changed, 112 insertions, 112 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 28e56da..b4a0473 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -159,7 +159,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
159 | m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); | 159 | m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); |
160 | m_log.Warn("[SEED]: " + capsBase + m_requestPath); | 160 | m_log.Warn("[SEED]: " + capsBase + m_requestPath); |
161 | //m_capsHandlers["MapLayer"] = | 161 | //m_capsHandlers["MapLayer"] = |
162 | // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", | 162 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", |
163 | // capsBase + m_mapLayerPath, | 163 | // capsBase + m_mapLayerPath, |
164 | // GetMapLayer); | 164 | // GetMapLayer); |
165 | m_capsHandlers["NewFileAgentInventory"] = | 165 | m_capsHandlers["NewFileAgentInventory"] = |
@@ -297,7 +297,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
297 | Hashtable inventoryhash = (Hashtable)foldersrequested[i]; | 297 | Hashtable inventoryhash = (Hashtable)foldersrequested[i]; |
298 | 298 | ||
299 | LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents(); | 299 | LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents(); |
300 | LLSDHelpers.DeserialiseLLSDMap(inventoryhash, llsdRequest); | 300 | LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest); |
301 | LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest); | 301 | LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest); |
302 | 302 | ||
303 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); | 303 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); |
@@ -431,7 +431,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
431 | { | 431 | { |
432 | m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName); | 432 | m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName); |
433 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); | 433 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); |
434 | mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse()); | 434 | mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); |
435 | return mapResponse; | 435 | return mapResponse; |
436 | } | 436 | } |
437 | 437 | ||
@@ -439,9 +439,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
439 | /// | 439 | /// |
440 | /// </summary> | 440 | /// </summary> |
441 | /// <returns></returns> | 441 | /// <returns></returns> |
442 | protected static LLSDMapLayer GetLLSDMapLayerResponse() | 442 | protected static OSDMapLayer GetOSDMapLayerResponse() |
443 | { | 443 | { |
444 | LLSDMapLayer mapLayer = new LLSDMapLayer(); | 444 | OSDMapLayer mapLayer = new OSDMapLayer(); |
445 | mapLayer.Right = 5000; | 445 | mapLayer.Right = 5000; |
446 | mapLayer.Top = 5000; | 446 | mapLayer.Top = 5000; |
447 | mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006"); | 447 | mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006"); |
@@ -545,7 +545,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
545 | 545 | ||
546 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | 546 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); |
547 | LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); | 547 | LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); |
548 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest); | 548 | LLSDHelpers.DeserialiseOSDMap(hash, llsdUpdateRequest); |
549 | 549 | ||
550 | string capsBase = "/CAPS/" + m_capsObjectPath; | 550 | string capsBase = "/CAPS/" + m_capsObjectPath; |
551 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 551 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
@@ -600,10 +600,10 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
600 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 600 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
601 | { | 601 | { |
602 | m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); | 602 | m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); |
603 | //OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request)); | 603 | //OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request)); |
604 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | 604 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); |
605 | LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); | 605 | LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); |
606 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); | 606 | LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); |
607 | 607 | ||
608 | string capsBase = "/CAPS/" + m_capsObjectPath; | 608 | string capsBase = "/CAPS/" + m_capsObjectPath; |
609 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 609 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs index 3579cc2..668ca79 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs | |||
@@ -30,11 +30,11 @@ using System.Collections; | |||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDType("ARRAY")] | 32 | [LLSDType("ARRAY")] |
33 | public class LLSDArray | 33 | public class OSDArray |
34 | { | 34 | { |
35 | public ArrayList Array = new ArrayList(); | 35 | public ArrayList Array = new ArrayList(); |
36 | 36 | ||
37 | public LLSDArray() | 37 | public OSDArray() |
38 | { | 38 | { |
39 | } | 39 | } |
40 | } | 40 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs index 5833b65..16547d5 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 | [LLSDMap] | 33 | [OSDMap] |
34 | public class LLSDAssetUploadRequest | 34 | public class LLSDAssetUploadRequest |
35 | { | 35 | { |
36 | public string asset_type = String.Empty; | 36 | public string asset_type = String.Empty; |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs index 63b3351..04e9ed7 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [OSDMap] |
33 | public class LLSDAssetUploadResponse | 33 | public class LLSDAssetUploadResponse |
34 | { | 34 | { |
35 | public string uploader = String.Empty; | 35 | public string uploader = String.Empty; |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs index 5ff21b8..d8a6265 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs | |||
@@ -31,7 +31,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
31 | public class LLSDCapEvent | 31 | public class LLSDCapEvent |
32 | { | 32 | { |
33 | public int id = 0; | 33 | public int id = 0; |
34 | public LLSDArray events = new LLSDArray(); | 34 | public OSDArray events = new OSDArray(); |
35 | 35 | ||
36 | public LLSDCapEvent() | 36 | public LLSDCapEvent() |
37 | { | 37 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs index b14bfdd..ae4a3db 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
44 | XmlTextWriter writer = new XmlTextWriter(sw); | 44 | XmlTextWriter writer = new XmlTextWriter(sw); |
45 | writer.Formatting = Formatting.None; | 45 | writer.Formatting = Formatting.None; |
46 | writer.WriteStartElement(String.Empty, "llsd", String.Empty); | 46 | writer.WriteStartElement(String.Empty, "llsd", String.Empty); |
47 | SerializeLLSDType(writer, obj); | 47 | SerializeOSDType(writer, obj); |
48 | writer.WriteEndElement(); | 48 | writer.WriteEndElement(); |
49 | writer.Close(); | 49 | writer.Close(); |
50 | 50 | ||
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
53 | return sw.ToString(); | 53 | return sw.ToString(); |
54 | } | 54 | } |
55 | 55 | ||
56 | private static void SerializeLLSDType(XmlTextWriter writer, object obj) | 56 | private static void SerializeOSDType(XmlTextWriter writer, object obj) |
57 | { | 57 | { |
58 | Type myType = obj.GetType(); | 58 | Type myType = obj.GetType(); |
59 | LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false); | 59 | LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false); |
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
76 | fieldName = fieldName.Replace("___", "-"); | 76 | fieldName = fieldName.Replace("___", "-"); |
77 | writer.WriteString(fieldName); | 77 | writer.WriteString(fieldName); |
78 | writer.WriteEndElement(); | 78 | writer.WriteEndElement(); |
79 | SerializeLLSDType(writer, fieldValue); | 79 | SerializeOSDType(writer, fieldValue); |
80 | } | 80 | } |
81 | else | 81 | else |
82 | { | 82 | { |
@@ -87,13 +87,13 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
87 | writer.WriteEndElement(); | 87 | writer.WriteEndElement(); |
88 | LLSD.LLSDWriteOne(writer, fieldValue); | 88 | LLSD.LLSDWriteOne(writer, fieldValue); |
89 | // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( | 89 | // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( |
90 | // writer, OpenMetaverse.StructuredData.LLSD.FromObject(fieldValue)); | 90 | // writer, OpenMetaverse.StructuredData.OSD.FromObject(fieldValue)); |
91 | } | 91 | } |
92 | } | 92 | } |
93 | writer.WriteEndElement(); | 93 | writer.WriteEndElement(); |
94 | break; | 94 | break; |
95 | case "ARRAY": | 95 | case "ARRAY": |
96 | // LLSDArray arrayObject = obj as LLSDArray; | 96 | // OSDArray arrayObject = obj as OSDArray; |
97 | // ArrayList a = arrayObject.Array; | 97 | // ArrayList a = arrayObject.Array; |
98 | ArrayList a = (ArrayList) obj.GetType().GetField("Array").GetValue(obj); | 98 | ArrayList a = (ArrayList) obj.GetType().GetField("Array").GetValue(obj); |
99 | if (a != null) | 99 | if (a != null) |
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
101 | writer.WriteStartElement(String.Empty, "array", String.Empty); | 101 | writer.WriteStartElement(String.Empty, "array", String.Empty); |
102 | foreach (object item in a) | 102 | foreach (object item in a) |
103 | { | 103 | { |
104 | SerializeLLSDType(writer, item); | 104 | SerializeOSDType(writer, item); |
105 | } | 105 | } |
106 | writer.WriteEndElement(); | 106 | writer.WriteEndElement(); |
107 | } | 107 | } |
@@ -112,11 +112,11 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
112 | { | 112 | { |
113 | LLSD.LLSDWriteOne(writer, obj); | 113 | LLSD.LLSDWriteOne(writer, obj); |
114 | //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( | 114 | //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( |
115 | // writer, OpenMetaverse.StructuredData.LLSD.FromObject(obj)); | 115 | // writer, OpenMetaverse.StructuredData.OSD.FromObject(obj)); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | public static object DeserialiseLLSDMap(Hashtable llsd, object obj) | 119 | public static object DeserialiseOSDMap(Hashtable llsd, object obj) |
120 | { | 120 | { |
121 | Type myType = obj.GetType(); | 121 | Type myType = obj.GetType(); |
122 | LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false); | 122 | LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false); |
@@ -133,12 +133,12 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
133 | FieldInfo field = myType.GetField(keyName); | 133 | FieldInfo field = myType.GetField(keyName); |
134 | if (field != null) | 134 | if (field != null) |
135 | { | 135 | { |
136 | // if (enumerator.Value is OpenMetaverse.StructuredData.LLSDMap) | 136 | // if (enumerator.Value is OpenMetaverse.StructuredData.OSDMap) |
137 | if (enumerator.Value is Hashtable) | 137 | if (enumerator.Value is Hashtable) |
138 | { | 138 | { |
139 | object fieldValue = field.GetValue(obj); | 139 | object fieldValue = field.GetValue(obj); |
140 | DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue); | 140 | DeserialiseOSDMap((Hashtable) enumerator.Value, fieldValue); |
141 | // DeserialiseLLSDMap((OpenMetaverse.StructuredData.LLSDMap) enumerator.Value, fieldValue); | 141 | // DeserialiseOSDMap((OpenMetaverse.StructuredData.OSDMap) enumerator.Value, fieldValue); |
142 | } | 142 | } |
143 | else if (enumerator.Value is ArrayList) | 143 | else if (enumerator.Value is ArrayList) |
144 | { | 144 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index ff36821..3651513 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |||
@@ -29,7 +29,7 @@ using OpenMetaverse; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [OSDMap] |
33 | public class LLSDInventoryItem | 33 | public class LLSDInventoryItem |
34 | { | 34 | { |
35 | public UUID parent_id; | 35 | public UUID parent_id; |
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
47 | public int created_at; | 47 | public int created_at; |
48 | } | 48 | } |
49 | 49 | ||
50 | [LLSDMap] | 50 | [OSDMap] |
51 | public class LLSDPermissions | 51 | public class LLSDPermissions |
52 | { | 52 | { |
53 | public UUID creator_id; | 53 | public UUID creator_id; |
@@ -61,20 +61,20 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
61 | public bool is_owner_group; | 61 | public bool is_owner_group; |
62 | } | 62 | } |
63 | 63 | ||
64 | [LLSDMap] | 64 | [OSDMap] |
65 | public class LLSDSaleInfo | 65 | public class LLSDSaleInfo |
66 | { | 66 | { |
67 | public int sale_price; | 67 | public int sale_price; |
68 | public string sale_type; | 68 | public string sale_type; |
69 | } | 69 | } |
70 | 70 | ||
71 | [LLSDMap] | 71 | [OSDMap] |
72 | public class LLSDInventoryDescendents | 72 | public class LLSDInventoryDescendents |
73 | { | 73 | { |
74 | public LLSDArray folders = new LLSDArray(); | 74 | public OSDArray folders = new OSDArray(); |
75 | } | 75 | } |
76 | 76 | ||
77 | [LLSDMap] | 77 | [OSDMap] |
78 | public class LLSDFetchInventoryDescendents | 78 | public class LLSDFetchInventoryDescendents |
79 | { | 79 | { |
80 | public UUID folder_id; | 80 | public UUID folder_id; |
@@ -84,13 +84,13 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
84 | public bool fetch_items; | 84 | public bool fetch_items; |
85 | } | 85 | } |
86 | 86 | ||
87 | [LLSDMap] | 87 | [OSDMap] |
88 | public class LLSDInventoryFolderContents | 88 | public class LLSDInventoryFolderContents |
89 | { | 89 | { |
90 | public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" | 90 | public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" |
91 | public int descendents; | 91 | public int descendents; |
92 | public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names | 92 | public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names |
93 | public LLSDArray items = new LLSDArray(); | 93 | public OSDArray items = new OSDArray(); |
94 | public UUID owner___id; // and of course we can't have field names with "-" in | 94 | public UUID owner___id; // and of course we can't have field names with "-" in |
95 | public int version; | 95 | public int version; |
96 | } | 96 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs index c147bd3..4568732 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs | |||
@@ -29,7 +29,7 @@ using OpenMetaverse; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [OSDMap] |
33 | public class LLSDItemUpdate | 33 | public class LLSDItemUpdate |
34 | { | 34 | { |
35 | public UUID item_id; | 35 | public UUID item_id; |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs index fc381e4..356fa5e 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs | |||
@@ -30,7 +30,7 @@ using OpenMetaverse; | |||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDType("MAP")] | 32 | [LLSDType("MAP")] |
33 | public class LLSDMapLayer | 33 | public class OSDMapLayer |
34 | { | 34 | { |
35 | public int Left = 0; | 35 | public int Left = 0; |
36 | public int Right = 0; | 36 | public int Right = 0; |
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
38 | public int Bottom = 0; | 38 | public int Bottom = 0; |
39 | public UUID ImageID = UUID.Zero; | 39 | public UUID ImageID = UUID.Zero; |
40 | 40 | ||
41 | public LLSDMapLayer() | 41 | public OSDMapLayer() |
42 | { | 42 | { |
43 | } | 43 | } |
44 | } | 44 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs index 7dabbec..26815f9 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs | |||
@@ -31,7 +31,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
31 | public class LLSDMapLayerResponse | 31 | public class LLSDMapLayerResponse |
32 | { | 32 | { |
33 | public LLSDMapRequest AgentData = new LLSDMapRequest(); | 33 | public LLSDMapRequest AgentData = new LLSDMapRequest(); |
34 | public LLSDArray LayerData = new LLSDArray(); | 34 | public OSDArray LayerData = new OSDArray(); |
35 | 35 | ||
36 | public LLSDMapLayerResponse() | 36 | public LLSDMapLayerResponse() |
37 | { | 37 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs index c045dcf..829a2a9 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs | |||
@@ -30,7 +30,7 @@ using System.Collections; | |||
30 | 30 | ||
31 | namespace OpenSim.Framework.Communications.Capabilities | 31 | namespace OpenSim.Framework.Communications.Capabilities |
32 | { | 32 | { |
33 | [LLSDMap] | 33 | [OSDMap] |
34 | public class LLSDParcelVoiceInfoResponse | 34 | public class LLSDParcelVoiceInfoResponse |
35 | { | 35 | { |
36 | public int parcel_local_id; | 36 | public int parcel_local_id; |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs index 7fcbb81..c68a205 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs | |||
@@ -53,12 +53,12 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
53 | //string requestBody = streamReader.ReadToEnd(); | 53 | //string requestBody = streamReader.ReadToEnd(); |
54 | //streamReader.Close(); | 54 | //streamReader.Close(); |
55 | 55 | ||
56 | // OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap) | 56 | // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap) |
57 | // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); | 57 | // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); |
58 | 58 | ||
59 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); | 59 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); |
60 | TRequest llsdRequest = new TRequest(); | 60 | TRequest llsdRequest = new TRequest(); |
61 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); | 61 | LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); |
62 | 62 | ||
63 | TResponse response = m_method(llsdRequest); | 63 | TResponse response = m_method(llsdRequest); |
64 | 64 | ||
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs index b34cbf9..bcea657 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs | |||
@@ -29,7 +29,7 @@ using OpenMetaverse; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [OSDMap] |
33 | public class LLSDTaskInventoryUploadComplete | 33 | public class LLSDTaskInventoryUploadComplete |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs index 730e95b..7401768 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs | |||
@@ -29,7 +29,7 @@ using OpenMetaverse; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDMap] | 32 | [OSDMap] |
33 | public class LLSDTaskScriptUpdate | 33 | public class LLSDTaskScriptUpdate |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs index 181a465..949e119 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs | |||
@@ -46,9 +46,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
46 | } | 46 | } |
47 | 47 | ||
48 | [AttributeUsage(AttributeTargets.Class)] | 48 | [AttributeUsage(AttributeTargets.Class)] |
49 | public class LLSDMap : LLSDType | 49 | public class OSDMap : LLSDType |
50 | { | 50 | { |
51 | public LLSDMap() : base("MAP") | 51 | public OSDMap() : base("MAP") |
52 | { | 52 | { |
53 | } | 53 | } |
54 | } | 54 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs index 8143233..6cd5ee3 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | namespace OpenSim.Framework.Communications.Capabilities | 29 | namespace OpenSim.Framework.Communications.Capabilities |
30 | { | 30 | { |
31 | [LLSDMap] | 31 | [OSDMap] |
32 | public class LLSDVoiceAccountResponse | 32 | public class LLSDVoiceAccountResponse |
33 | { | 33 | { |
34 | public string username; | 34 | public string username; |
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index b2565b1..867e9e6 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs | |||
@@ -201,17 +201,17 @@ namespace OpenSim.Framework.Communications | |||
201 | return (xmlRpcResponse); | 201 | return (xmlRpcResponse); |
202 | } | 202 | } |
203 | 203 | ||
204 | public LLSD GenerateFailureResponseLLSD(string reason, string message, string login) | 204 | public OSD GenerateFailureResponseLLSD(string reason, string message, string login) |
205 | { | 205 | { |
206 | LLSDMap map = new LLSDMap(); | 206 | OSDMap map = new OSDMap(); |
207 | 207 | ||
208 | // Ensure Login Failed message/reason; | 208 | // Ensure Login Failed message/reason; |
209 | ErrorMessage = message; | 209 | ErrorMessage = message; |
210 | ErrorReason = reason; | 210 | ErrorReason = reason; |
211 | 211 | ||
212 | map["reason"] = LLSD.FromString(ErrorReason); | 212 | map["reason"] = OSD.FromString(ErrorReason); |
213 | map["message"] = LLSD.FromString(ErrorMessage); | 213 | map["message"] = OSD.FromString(ErrorMessage); |
214 | map["login"] = LLSD.FromString(login); | 214 | map["login"] = OSD.FromString(login); |
215 | 215 | ||
216 | return map; | 216 | return map; |
217 | } | 217 | } |
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Communications | |||
221 | return (CreateLoginFailedResponse()); | 221 | return (CreateLoginFailedResponse()); |
222 | } | 222 | } |
223 | 223 | ||
224 | public LLSD CreateFailedResponseLLSD() | 224 | public OSD CreateFailedResponseLLSD() |
225 | { | 225 | { |
226 | return CreateLoginFailedResponseLLSD(); | 226 | return CreateLoginFailedResponseLLSD(); |
227 | } | 227 | } |
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications | |||
234 | "false")); | 234 | "false")); |
235 | } | 235 | } |
236 | 236 | ||
237 | public LLSD CreateLoginFailedResponseLLSD() | 237 | public OSD CreateLoginFailedResponseLLSD() |
238 | { | 238 | { |
239 | return GenerateFailureResponseLLSD( | 239 | return GenerateFailureResponseLLSD( |
240 | "key", | 240 | "key", |
@@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications | |||
265 | "false")); | 265 | "false")); |
266 | } | 266 | } |
267 | 267 | ||
268 | public LLSD CreateAlreadyLoggedInResponseLLSD() | 268 | public OSD CreateAlreadyLoggedInResponseLLSD() |
269 | { | 269 | { |
270 | return GenerateFailureResponseLLSD( | 270 | return GenerateFailureResponseLLSD( |
271 | "presence", | 271 | "presence", |
@@ -283,7 +283,7 @@ namespace OpenSim.Framework.Communications | |||
283 | "false")); | 283 | "false")); |
284 | } | 284 | } |
285 | 285 | ||
286 | public LLSD CreateLoginBlockedResponseLLSD() | 286 | public OSD CreateLoginBlockedResponseLLSD() |
287 | { | 287 | { |
288 | return GenerateFailureResponseLLSD( | 288 | return GenerateFailureResponseLLSD( |
289 | "presence", | 289 | "presence", |
@@ -299,7 +299,7 @@ namespace OpenSim.Framework.Communications | |||
299 | "false")); | 299 | "false")); |
300 | } | 300 | } |
301 | 301 | ||
302 | public LLSD CreateDeadRegionResponseLLSD() | 302 | public OSD CreateDeadRegionResponseLLSD() |
303 | { | 303 | { |
304 | return GenerateFailureResponseLLSD( | 304 | return GenerateFailureResponseLLSD( |
305 | "key", | 305 | "key", |
@@ -315,7 +315,7 @@ namespace OpenSim.Framework.Communications | |||
315 | "false")); | 315 | "false")); |
316 | } | 316 | } |
317 | 317 | ||
318 | public LLSD CreateGridErrorResponseLLSD() | 318 | public OSD CreateGridErrorResponseLLSD() |
319 | { | 319 | { |
320 | return GenerateFailureResponseLLSD( | 320 | return GenerateFailureResponseLLSD( |
321 | "key", | 321 | "key", |
@@ -404,90 +404,90 @@ namespace OpenSim.Framework.Communications | |||
404 | } | 404 | } |
405 | } | 405 | } |
406 | 406 | ||
407 | public LLSD ToLLSDResponse() | 407 | public OSD ToLLSDResponse() |
408 | { | 408 | { |
409 | try | 409 | try |
410 | { | 410 | { |
411 | LLSDMap map = new LLSDMap(); | 411 | OSDMap map = new OSDMap(); |
412 | 412 | ||
413 | map["first_name"] = LLSD.FromString(Firstname); | 413 | map["first_name"] = OSD.FromString(Firstname); |
414 | map["last_name"] = LLSD.FromString(Lastname); | 414 | map["last_name"] = OSD.FromString(Lastname); |
415 | map["agent_access"] = LLSD.FromString(agentAccess); | 415 | map["agent_access"] = OSD.FromString(agentAccess); |
416 | 416 | ||
417 | map["sim_port"] = LLSD.FromInteger(SimPort); | 417 | map["sim_port"] = OSD.FromInteger(SimPort); |
418 | map["sim_ip"] = LLSD.FromString(SimAddress); | 418 | map["sim_ip"] = OSD.FromString(SimAddress); |
419 | 419 | ||
420 | map["agent_id"] = LLSD.FromUUID(AgentID); | 420 | map["agent_id"] = OSD.FromUUID(AgentID); |
421 | map["session_id"] = LLSD.FromUUID(SessionID); | 421 | map["session_id"] = OSD.FromUUID(SessionID); |
422 | map["secure_session_id"] = LLSD.FromUUID(SecureSessionID); | 422 | map["secure_session_id"] = OSD.FromUUID(SecureSessionID); |
423 | map["circuit_code"] = LLSD.FromInteger(CircuitCode); | 423 | map["circuit_code"] = OSD.FromInteger(CircuitCode); |
424 | map["seconds_since_epoch"] = LLSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds); | 424 | map["seconds_since_epoch"] = OSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds); |
425 | 425 | ||
426 | #region Login Flags | 426 | #region Login Flags |
427 | 427 | ||
428 | LLSDMap loginFlagsLLSD = new LLSDMap(); | 428 | OSDMap loginFlagsLLSD = new OSDMap(); |
429 | loginFlagsLLSD["daylight_savings"] = LLSD.FromString(DST); | 429 | loginFlagsLLSD["daylight_savings"] = OSD.FromString(DST); |
430 | loginFlagsLLSD["stipend_since_login"] = LLSD.FromString(StipendSinceLogin); | 430 | loginFlagsLLSD["stipend_since_login"] = OSD.FromString(StipendSinceLogin); |
431 | loginFlagsLLSD["gendered"] = LLSD.FromString(Gendered); | 431 | loginFlagsLLSD["gendered"] = OSD.FromString(Gendered); |
432 | loginFlagsLLSD["ever_logged_in"] = LLSD.FromString(EverLoggedIn); | 432 | loginFlagsLLSD["ever_logged_in"] = OSD.FromString(EverLoggedIn); |
433 | map["login-flags"] = WrapLLSDMap(loginFlagsLLSD); | 433 | map["login-flags"] = WrapOSDMap(loginFlagsLLSD); |
434 | 434 | ||
435 | #endregion Login Flags | 435 | #endregion Login Flags |
436 | 436 | ||
437 | #region Global Textures | 437 | #region Global Textures |
438 | 438 | ||
439 | LLSDMap globalTexturesLLSD = new LLSDMap(); | 439 | OSDMap globalTexturesLLSD = new OSDMap(); |
440 | globalTexturesLLSD["sun_texture_id"] = LLSD.FromString(SunTexture); | 440 | globalTexturesLLSD["sun_texture_id"] = OSD.FromString(SunTexture); |
441 | globalTexturesLLSD["cloud_texture_id"] = LLSD.FromString(CloudTexture); | 441 | globalTexturesLLSD["cloud_texture_id"] = OSD.FromString(CloudTexture); |
442 | globalTexturesLLSD["moon_texture_id"] = LLSD.FromString(MoonTexture); | 442 | globalTexturesLLSD["moon_texture_id"] = OSD.FromString(MoonTexture); |
443 | 443 | ||
444 | map["global-textures"] = WrapLLSDMap(globalTexturesLLSD); | 444 | map["global-textures"] = WrapOSDMap(globalTexturesLLSD); |
445 | 445 | ||
446 | #endregion Global Textures | 446 | #endregion Global Textures |
447 | 447 | ||
448 | map["seed_capability"] = LLSD.FromString(seedCapability); | 448 | map["seed_capability"] = OSD.FromString(seedCapability); |
449 | 449 | ||
450 | map["event_categories"] = ArrayListToLLSDArray(eventCategories); | 450 | map["event_categories"] = ArrayListToOSDArray(eventCategories); |
451 | //map["event_notifications"] = new LLSDArray(); // todo | 451 | //map["event_notifications"] = new OSDArray(); // todo |
452 | map["classified_categories"] = ArrayListToLLSDArray(classifiedCategories); | 452 | map["classified_categories"] = ArrayListToOSDArray(classifiedCategories); |
453 | 453 | ||
454 | #region UI Config | 454 | #region UI Config |
455 | 455 | ||
456 | LLSDMap uiConfigLLSD = new LLSDMap(); | 456 | OSDMap uiConfigLLSD = new OSDMap(); |
457 | uiConfigLLSD["allow_first_life"] = LLSD.FromString(allowFirstLife); | 457 | uiConfigLLSD["allow_first_life"] = OSD.FromString(allowFirstLife); |
458 | map["ui-config"] = WrapLLSDMap(uiConfigLLSD); | 458 | map["ui-config"] = WrapOSDMap(uiConfigLLSD); |
459 | 459 | ||
460 | #endregion UI Config | 460 | #endregion UI Config |
461 | 461 | ||
462 | #region Inventory | 462 | #region Inventory |
463 | 463 | ||
464 | map["inventory-skeleton"] = ArrayListToLLSDArray(agentInventory); | 464 | map["inventory-skeleton"] = ArrayListToOSDArray(agentInventory); |
465 | 465 | ||
466 | map["inventory-skel-lib"] = ArrayListToLLSDArray(inventoryLibrary); | 466 | map["inventory-skel-lib"] = ArrayListToOSDArray(inventoryLibrary); |
467 | map["inventory-root"] = ArrayListToLLSDArray(inventoryRoot); ; | 467 | map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); ; |
468 | map["inventory-lib-root"] = ArrayListToLLSDArray(inventoryLibRoot); | 468 | map["inventory-lib-root"] = ArrayListToOSDArray(inventoryLibRoot); |
469 | map["inventory-lib-owner"] = ArrayListToLLSDArray(inventoryLibraryOwner); | 469 | map["inventory-lib-owner"] = ArrayListToOSDArray(inventoryLibraryOwner); |
470 | 470 | ||
471 | #endregion Inventory | 471 | #endregion Inventory |
472 | 472 | ||
473 | map["gestures"] = ArrayListToLLSDArray(activeGestures); | 473 | map["gestures"] = ArrayListToOSDArray(activeGestures); |
474 | 474 | ||
475 | map["initial-outfit"] = ArrayListToLLSDArray(initialOutfit); | 475 | map["initial-outfit"] = ArrayListToOSDArray(initialOutfit); |
476 | map["start_location"] = LLSD.FromString(startLocation); | 476 | map["start_location"] = OSD.FromString(startLocation); |
477 | 477 | ||
478 | map["seed_capability"] = LLSD.FromString(seedCapability); | 478 | map["seed_capability"] = OSD.FromString(seedCapability); |
479 | map["home"] = LLSD.FromString(home); | 479 | map["home"] = OSD.FromString(home); |
480 | map["look_at"] = LLSD.FromString(lookAt); | 480 | map["look_at"] = OSD.FromString(lookAt); |
481 | map["message"] = LLSD.FromString(welcomeMessage); | 481 | map["message"] = OSD.FromString(welcomeMessage); |
482 | map["region_x"] = LLSD.FromInteger(RegionX * Constants.RegionSize); | 482 | map["region_x"] = OSD.FromInteger(RegionX * Constants.RegionSize); |
483 | map["region_y"] = LLSD.FromInteger(RegionY * Constants.RegionSize); | 483 | map["region_y"] = OSD.FromInteger(RegionY * Constants.RegionSize); |
484 | 484 | ||
485 | if (m_buddyList != null) | 485 | if (m_buddyList != null) |
486 | { | 486 | { |
487 | map["buddy-list"] = ArrayListToLLSDArray(m_buddyList.ToArray()); | 487 | map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); |
488 | } | 488 | } |
489 | 489 | ||
490 | map["login"] = LLSD.FromString("true"); | 490 | map["login"] = OSD.FromString("true"); |
491 | 491 | ||
492 | return map; | 492 | return map; |
493 | } | 493 | } |
@@ -499,24 +499,24 @@ namespace OpenSim.Framework.Communications | |||
499 | } | 499 | } |
500 | } | 500 | } |
501 | 501 | ||
502 | public LLSDArray ArrayListToLLSDArray(ArrayList arrlst) | 502 | public OSDArray ArrayListToOSDArray(ArrayList arrlst) |
503 | { | 503 | { |
504 | LLSDArray llsdBack = new LLSDArray(); | 504 | OSDArray llsdBack = new OSDArray(); |
505 | foreach (Hashtable ht in arrlst) | 505 | foreach (Hashtable ht in arrlst) |
506 | { | 506 | { |
507 | LLSDMap mp = new LLSDMap(); | 507 | OSDMap mp = new OSDMap(); |
508 | foreach (DictionaryEntry deHt in ht) | 508 | foreach (DictionaryEntry deHt in ht) |
509 | { | 509 | { |
510 | mp.Add((string)deHt.Key, LLSDString.FromObject(deHt.Value)); | 510 | mp.Add((string)deHt.Key, OSDString.FromObject(deHt.Value)); |
511 | } | 511 | } |
512 | llsdBack.Add(mp); | 512 | llsdBack.Add(mp); |
513 | } | 513 | } |
514 | return llsdBack; | 514 | return llsdBack; |
515 | } | 515 | } |
516 | 516 | ||
517 | private static LLSDArray WrapLLSDMap(LLSDMap wrapMe) | 517 | private static OSDArray WrapOSDMap(OSDMap wrapMe) |
518 | { | 518 | { |
519 | LLSDArray array = new LLSDArray(); | 519 | OSDArray array = new OSDArray(); |
520 | array.Add(wrapMe); | 520 | array.Add(wrapMe); |
521 | return array; | 521 | return array; |
522 | } | 522 | } |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 7fd1c3b..b4ee069 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -321,7 +321,7 @@ namespace OpenSim.Framework.Communications | |||
321 | /// </summary> | 321 | /// </summary> |
322 | /// <param name="request">The LLSD request</param> | 322 | /// <param name="request">The LLSD request</param> |
323 | /// <returns>The response to send</returns> | 323 | /// <returns>The response to send</returns> |
324 | public LLSD LLSDLoginMethod(LLSD request) | 324 | public OSD LLSDLoginMethod(OSD request) |
325 | { | 325 | { |
326 | // Temporary fix | 326 | // Temporary fix |
327 | m_loginMutex.WaitOne(); | 327 | m_loginMutex.WaitOne(); |
@@ -335,9 +335,9 @@ namespace OpenSim.Framework.Communications | |||
335 | UserProfileData userProfile = null; | 335 | UserProfileData userProfile = null; |
336 | LoginResponse logResponse = new LoginResponse(); | 336 | LoginResponse logResponse = new LoginResponse(); |
337 | 337 | ||
338 | if (request.Type == LLSDType.Map) | 338 | if (request.Type == OSDType.Map) |
339 | { | 339 | { |
340 | LLSDMap map = (LLSDMap)request; | 340 | OSDMap map = (OSDMap)request; |
341 | 341 | ||
342 | if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd")) | 342 | if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd")) |
343 | { | 343 | { |
@@ -749,7 +749,7 @@ namespace OpenSim.Framework.Communications | |||
749 | m_userManager.CreateAgent(profile, request); | 749 | m_userManager.CreateAgent(profile, request); |
750 | } | 750 | } |
751 | 751 | ||
752 | public void CreateAgent(UserProfileData profile, LLSD request) | 752 | public void CreateAgent(UserProfileData profile, OSD request) |
753 | { | 753 | { |
754 | m_userManager.CreateAgent(profile, request); | 754 | m_userManager.CreateAgent(profile, request); |
755 | } | 755 | } |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 7189eee..4b5d2bb 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -448,7 +448,7 @@ namespace OpenSim.Framework.Communications | |||
448 | profile.CurrentAgent = agent; | 448 | profile.CurrentAgent = agent; |
449 | } | 449 | } |
450 | 450 | ||
451 | public void CreateAgent(UserProfileData profile, LLSD request) | 451 | public void CreateAgent(UserProfileData profile, OSD request) |
452 | { | 452 | { |
453 | UserAgentData agent = new UserAgentData(); | 453 | UserAgentData agent = new UserAgentData(); |
454 | 454 | ||