aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/Capabilities
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs76
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs24
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs14
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs26
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs8
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs8
12 files changed, 95 insertions, 95 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a7486d6..e82a5e9 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
@@ -40,21 +40,21 @@ using OpenSim.Region.Interfaces;
40namespace OpenSim.Framework.Communications.Capabilities 40namespace OpenSim.Framework.Communications.Capabilities
41{ 41{
42 public delegate void UpLoadedAsset( 42 public delegate void UpLoadedAsset(
43 string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, 43 string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder,
44 byte[] data, string inventoryType, string assetType); 44 byte[] data, string inventoryType, string assetType);
45 45
46 public delegate LLUUID UpdateItem(LLUUID itemID, byte[] data); 46 public delegate UUID UpdateItem(UUID itemID, byte[] data);
47 47
48 public delegate void UpdateTaskScript(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data); 48 public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data);
49 49
50 public delegate void NewInventoryItem(LLUUID userID, InventoryItemBase item); 50 public delegate void NewInventoryItem(UUID userID, InventoryItemBase item);
51 51
52 public delegate LLUUID ItemUpdatedCallback(LLUUID userID, LLUUID itemID, byte[] data); 52 public delegate UUID ItemUpdatedCallback(UUID userID, UUID itemID, byte[] data);
53 53
54 public delegate void TaskScriptUpdatedCallback(LLUUID userID, LLUUID itemID, LLUUID primID, 54 public delegate void TaskScriptUpdatedCallback(UUID userID, UUID itemID, UUID primID,
55 bool isScriptRunning, byte[] data); 55 bool isScriptRunning, byte[] data);
56 56
57 public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, 57 public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
58 bool fetchFolders, bool fetchItems, int sortOrder); 58 bool fetchFolders, bool fetchItems, int sortOrder);
59 59
60 /// <summary> 60 /// <summary>
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Communications.Capabilities
62 /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want 62 /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want
63 /// to just pass the whole Scene into CAPS. 63 /// to just pass the whole Scene into CAPS.
64 /// </summary> 64 /// </summary>
65 public delegate IClientAPI GetClientDelegate(LLUUID agentID); 65 public delegate IClientAPI GetClientDelegate(UUID agentID);
66 66
67 public class Caps 67 public class Caps
68 { 68 {
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Communications.Capabilities
97 97
98 //private string eventQueue = "0100/"; 98 //private string eventQueue = "0100/";
99 private BaseHttpServer m_httpListener; 99 private BaseHttpServer m_httpListener;
100 private LLUUID m_agentID; 100 private UUID m_agentID;
101 private AssetCache m_assetCache; 101 private AssetCache m_assetCache;
102 private int m_eventQueueCount = 1; 102 private int m_eventQueueCount = 1;
103 private Queue<string> m_capsEventQueue = new Queue<string>(); 103 private Queue<string> m_capsEventQueue = new Queue<string>();
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Communications.Capabilities
113 public GetClientDelegate GetClient = null; 113 public GetClientDelegate GetClient = null;
114 114
115 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, 115 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
116 LLUUID agent, bool dumpAssetsToFile, string regionName) 116 UUID agent, bool dumpAssetsToFile, string regionName)
117 { 117 {
118 m_assetCache = assetCache; 118 m_assetCache = assetCache;
119 m_capsObjectPath = capsPath; 119 m_capsObjectPath = capsPath;
@@ -258,7 +258,7 @@ namespace OpenSim.Framework.Communications.Capabilities
258 Hashtable hash = new Hashtable(); 258 Hashtable hash = new Hashtable();
259 try 259 try
260 { 260 {
261 hash = (Hashtable)LLSD.LLSDDeserialize(Helpers.StringToField(request)); 261 hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
262 } 262 }
263 catch (LLSD.LLSDParseException pe) 263 catch (LLSD.LLSDParseException pe)
264 { 264 {
@@ -388,7 +388,7 @@ namespace OpenSim.Framework.Communications.Capabilities
388 llsdItem.permissions.creator_id = invItem.Creator; 388 llsdItem.permissions.creator_id = invItem.Creator;
389 llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; 389 llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
390 llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions; 390 llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
391 llsdItem.permissions.group_id = LLUUID.Zero; 391 llsdItem.permissions.group_id = UUID.Zero;
392 llsdItem.permissions.group_mask = 0; 392 llsdItem.permissions.group_mask = 0;
393 llsdItem.permissions.is_owner_group = false; 393 llsdItem.permissions.is_owner_group = false;
394 llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions; 394 llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
@@ -423,7 +423,7 @@ namespace OpenSim.Framework.Communications.Capabilities
423 LLSDMapLayer mapLayer = new LLSDMapLayer(); 423 LLSDMapLayer mapLayer = new LLSDMapLayer();
424 mapLayer.Right = 5000; 424 mapLayer.Right = 5000;
425 mapLayer.Top = 5000; 425 mapLayer.Top = 5000;
426 mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); 426 mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006");
427 427
428 return mapLayer; 428 return mapLayer;
429 } 429 }
@@ -522,7 +522,7 @@ namespace OpenSim.Framework.Communications.Capabilities
522 m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName); 522 m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
523 //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); 523 //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
524 524
525 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); 525 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
526 LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); 526 LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();
527 LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest); 527 LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest);
528 528
@@ -573,8 +573,8 @@ namespace OpenSim.Framework.Communications.Capabilities
573 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 573 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
574 { 574 {
575 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); 575 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName);
576 //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); 576 //OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request));
577 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); 577 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
578 LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); 578 LLSDItemUpdate llsdRequest = new LLSDItemUpdate();
579 LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); 579 LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
580 580
@@ -636,9 +636,9 @@ namespace OpenSim.Framework.Communications.Capabilities
636 string assetName = llsdRequest.name; 636 string assetName = llsdRequest.name;
637 string assetDes = llsdRequest.description; 637 string assetDes = llsdRequest.description;
638 string capsBase = "/CAPS/" + m_capsObjectPath; 638 string capsBase = "/CAPS/" + m_capsObjectPath;
639 LLUUID newAsset = LLUUID.Random(); 639 UUID newAsset = UUID.Random();
640 LLUUID newInvItem = LLUUID.Random(); 640 UUID newInvItem = UUID.Random();
641 LLUUID parentFolder = llsdRequest.folder_id; 641 UUID parentFolder = llsdRequest.folder_id;
642 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); 642 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
643 643
644 AssetUploader uploader = 644 AssetUploader uploader =
@@ -662,8 +662,8 @@ namespace OpenSim.Framework.Communications.Capabilities
662 /// <param name="assetID"></param> 662 /// <param name="assetID"></param>
663 /// <param name="inventoryItem"></param> 663 /// <param name="inventoryItem"></param>
664 /// <param name="data"></param> 664 /// <param name="data"></param>
665 public void UploadCompleteHandler(string assetName, string assetDescription, LLUUID assetID, 665 public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
666 LLUUID inventoryItem, LLUUID parentFolder, byte[] data, string inventoryType, 666 UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
667 string assetType) 667 string assetType)
668 { 668 {
669 sbyte assType = 0; 669 sbyte assType = 0;
@@ -728,14 +728,14 @@ namespace OpenSim.Framework.Communications.Capabilities
728 /// <param name="itemID">Item to update</param> 728 /// <param name="itemID">Item to update</param>
729 /// <param name="data">New asset data</param> 729 /// <param name="data">New asset data</param>
730 /// <returns></returns> 730 /// <returns></returns>
731 public LLUUID ItemUpdated(LLUUID itemID, byte[] data) 731 public UUID ItemUpdated(UUID itemID, byte[] data)
732 { 732 {
733 if (ItemUpdatedCall != null) 733 if (ItemUpdatedCall != null)
734 { 734 {
735 return ItemUpdatedCall(m_agentID, itemID, data); 735 return ItemUpdatedCall(m_agentID, itemID, data);
736 } 736 }
737 737
738 return LLUUID.Zero; 738 return UUID.Zero;
739 } 739 }
740 740
741 /// <summary> 741 /// <summary>
@@ -745,7 +745,7 @@ namespace OpenSim.Framework.Communications.Capabilities
745 /// <param name="primID">Prim containing item to update</param> 745 /// <param name="primID">Prim containing item to update</param>
746 /// <param name="isScriptRunning">Signals whether the script to update is currently running</param> 746 /// <param name="isScriptRunning">Signals whether the script to update is currently running</param>
747 /// <param name="data">New asset data</param> 747 /// <param name="data">New asset data</param>
748 public void TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data) 748 public void TaskScriptUpdated(UUID itemID, UUID primID, bool isScriptRunning, byte[] data)
749 { 749 {
750 if (TaskScriptUpdatedCall != null) 750 if (TaskScriptUpdatedCall != null)
751 { 751 {
@@ -759,9 +759,9 @@ namespace OpenSim.Framework.Communications.Capabilities
759 private UpLoadedAsset handlerUpLoad = null; 759 private UpLoadedAsset handlerUpLoad = null;
760 760
761 private string uploaderPath = String.Empty; 761 private string uploaderPath = String.Empty;
762 private LLUUID newAssetID; 762 private UUID newAssetID;
763 private LLUUID inventoryItemID; 763 private UUID inventoryItemID;
764 private LLUUID parentFolder; 764 private UUID parentFolder;
765 private BaseHttpServer httpListener; 765 private BaseHttpServer httpListener;
766 private bool m_dumpAssetsToFile; 766 private bool m_dumpAssetsToFile;
767 private string m_assetName = String.Empty; 767 private string m_assetName = String.Empty;
@@ -770,8 +770,8 @@ namespace OpenSim.Framework.Communications.Capabilities
770 private string m_invType = String.Empty; 770 private string m_invType = String.Empty;
771 private string m_assetType = String.Empty; 771 private string m_assetType = String.Empty;
772 772
773 public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, 773 public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem,
774 LLUUID parentFolderID, string invType, string assetType, string path, 774 UUID parentFolderID, string invType, string assetType, string path,
775 BaseHttpServer httpServer, bool dumpAssetsToFile) 775 BaseHttpServer httpServer, bool dumpAssetsToFile)
776 { 776 {
777 m_assetName = assetName; 777 m_assetName = assetName;
@@ -795,7 +795,7 @@ namespace OpenSim.Framework.Communications.Capabilities
795 /// <returns></returns> 795 /// <returns></returns>
796 public string uploaderCaps(byte[] data, string path, string param) 796 public string uploaderCaps(byte[] data, string path, string param)
797 { 797 {
798 LLUUID inv = inventoryItemID; 798 UUID inv = inventoryItemID;
799 string res = String.Empty; 799 string res = String.Empty;
800 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 800 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
801 uploadComplete.new_asset = newAssetID.ToString(); 801 uploadComplete.new_asset = newAssetID.ToString();
@@ -860,11 +860,11 @@ namespace OpenSim.Framework.Communications.Capabilities
860 private UpdateItem handlerUpdateItem = null; 860 private UpdateItem handlerUpdateItem = null;
861 861
862 private string uploaderPath = String.Empty; 862 private string uploaderPath = String.Empty;
863 private LLUUID inventoryItemID; 863 private UUID inventoryItemID;
864 private BaseHttpServer httpListener; 864 private BaseHttpServer httpListener;
865 private bool m_dumpAssetToFile; 865 private bool m_dumpAssetToFile;
866 866
867 public ItemUpdater(LLUUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile) 867 public ItemUpdater(UUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile)
868 { 868 {
869 m_dumpAssetToFile = dumpAssetToFile; 869 m_dumpAssetToFile = dumpAssetToFile;
870 870
@@ -882,10 +882,10 @@ namespace OpenSim.Framework.Communications.Capabilities
882 /// <returns></returns> 882 /// <returns></returns>
883 public string uploaderCaps(byte[] data, string path, string param) 883 public string uploaderCaps(byte[] data, string path, string param)
884 { 884 {
885 LLUUID inv = inventoryItemID; 885 UUID inv = inventoryItemID;
886 string res = String.Empty; 886 string res = String.Empty;
887 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 887 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
888 LLUUID assetID = LLUUID.Zero; 888 UUID assetID = UUID.Zero;
889 handlerUpdateItem = OnUpLoad; 889 handlerUpdateItem = OnUpLoad;
890 if (handlerUpdateItem != null) 890 if (handlerUpdateItem != null)
891 { 891 {
@@ -942,13 +942,13 @@ namespace OpenSim.Framework.Communications.Capabilities
942 private UpdateTaskScript handlerUpdateTaskScript = null; 942 private UpdateTaskScript handlerUpdateTaskScript = null;
943 943
944 private string uploaderPath = String.Empty; 944 private string uploaderPath = String.Empty;
945 private LLUUID inventoryItemID; 945 private UUID inventoryItemID;
946 private LLUUID primID; 946 private UUID primID;
947 private bool isScriptRunning; 947 private bool isScriptRunning;
948 private BaseHttpServer httpListener; 948 private BaseHttpServer httpListener;
949 private bool m_dumpAssetToFile; 949 private bool m_dumpAssetToFile;
950 950
951 public TaskInventoryScriptUpdater(LLUUID inventoryItemID, LLUUID primID, int isScriptRunning, 951 public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, int isScriptRunning,
952 string path, BaseHttpServer httpServer, bool dumpAssetToFile) 952 string path, BaseHttpServer httpServer, bool dumpAssetToFile)
953 { 953 {
954 m_dumpAssetToFile = dumpAssetToFile; 954 m_dumpAssetToFile = dumpAssetToFile;
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index aa9951c..44c4a05 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -32,7 +32,7 @@ using System.IO;
32using System.Security.Cryptography; 32using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using System.Xml; 34using System.Xml;
35using libsecondlife; 35using OpenMetaverse;
36 36
37namespace OpenSim.Framework.Communications.Capabilities 37namespace OpenSim.Framework.Communications.Capabilities
38{ 38{
@@ -158,9 +158,9 @@ namespace OpenSim.Framework.Communications.Capabilities
158 { 158 {
159 throw new Exception("ulong in LLSD is currently not implemented, fix me!"); 159 throw new Exception("ulong in LLSD is currently not implemented, fix me!");
160 } 160 }
161 else if (obj is LLUUID) 161 else if (obj is UUID)
162 { 162 {
163 LLUUID u = (LLUUID) obj; 163 UUID u = (UUID) obj;
164 writer.WriteStartElement(String.Empty, "uuid", String.Empty); 164 writer.WriteStartElement(String.Empty, "uuid", String.Empty);
165 writer.WriteString(u.ToString()); 165 writer.WriteString(u.ToString());
166 writer.WriteEndElement(); 166 writer.WriteEndElement();
@@ -294,11 +294,11 @@ namespace OpenSim.Framework.Communications.Capabilities
294 if (reader.IsEmptyElement) 294 if (reader.IsEmptyElement)
295 { 295 {
296 reader.Read(); 296 reader.Read();
297 return LLUUID.Zero; 297 return UUID.Zero;
298 } 298 }
299 299
300 reader.Read(); 300 reader.Read();
301 ret = new LLUUID(reader.ReadString().Trim()); 301 ret = new UUID(reader.ReadString().Trim());
302 break; 302 break;
303 } 303 }
304 case "string": 304 case "string":
@@ -476,9 +476,9 @@ namespace OpenSim.Framework.Communications.Capabilities
476 { 476 {
477 return GetSpaces(indent) + "- float " + obj.ToString() + "\n"; 477 return GetSpaces(indent) + "- float " + obj.ToString() + "\n";
478 } 478 }
479 else if (obj is LLUUID) 479 else if (obj is UUID)
480 { 480 {
481 return GetSpaces(indent) + "- uuid " + ((LLUUID) obj).ToString() + Environment.NewLine; 481 return GetSpaces(indent) + "- uuid " + ((UUID) obj).ToString() + Environment.NewLine;
482 } 482 }
483 else if (obj is Hashtable) 483 else if (obj is Hashtable)
484 { 484 {
@@ -509,7 +509,7 @@ namespace OpenSim.Framework.Communications.Capabilities
509 } 509 }
510 else if (obj is byte[]) 510 else if (obj is byte[])
511 { 511 {
512 return GetSpaces(indent) + "- binary\n" + Helpers.FieldToHexString((byte[]) obj, GetSpaces(indent)) + 512 return GetSpaces(indent) + "- binary\n" + Utils.BytesToHexString((byte[]) obj, GetSpaces(indent)) +
513 Environment.NewLine; 513 Environment.NewLine;
514 } 514 }
515 else 515 else
@@ -568,14 +568,14 @@ namespace OpenSim.Framework.Communications.Capabilities
568 } 568 }
569 case 'u': 569 case 'u':
570 { 570 {
571 if (llsd.Length < 17) throw new LLSDParseException("LLUUID value type with no value"); 571 if (llsd.Length < 17) throw new LLSDParseException("UUID value type with no value");
572 LLUUID value; 572 UUID value;
573 endPos = FindEnd(llsd, 1); 573 endPos = FindEnd(llsd, 1);
574 574
575 if (LLUUID.TryParse(llsd.Substring(1, endPos - 1), out value)) 575 if (UUID.TryParse(llsd.Substring(1, endPos - 1), out value))
576 return value; 576 return value;
577 else 577 else
578 throw new LLSDParseException("Failed to parse LLUUID value type"); 578 throw new LLSDParseException("Failed to parse UUID value type");
579 } 579 }
580 case 'b': 580 case 'b':
581 //byte[] value = new byte[llsd.Length - 1]; 581 //byte[] value = new byte[llsd.Length - 1];
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 6c4db4b..680dcc8 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Communications.Capabilities
34 public class LLSDAssetUploadComplete 34 public class LLSDAssetUploadComplete
35 { 35 {
36 public string new_asset = String.Empty; 36 public string new_asset = String.Empty;
37 public LLUUID new_inventory_item = LLUUID.Zero; 37 public UUID new_inventory_item = UUID.Zero;
38 public string state = String.Empty; 38 public string state = String.Empty;
39 //public bool success = false; 39 //public bool success = false;
40 40
@@ -42,4 +42,4 @@ namespace OpenSim.Framework.Communications.Capabilities
42 { 42 {
43 } 43 }
44 } 44 }
45} \ No newline at end of file 45}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 289cc93..5833b65 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Communications.Capabilities
35 { 35 {
36 public string asset_type = String.Empty; 36 public string asset_type = String.Empty;
37 public string description = String.Empty; 37 public string description = String.Empty;
38 public LLUUID folder_id = LLUUID.Zero; 38 public UUID folder_id = UUID.Zero;
39 public string inventory_type = String.Empty; 39 public string inventory_type = String.Empty;
40 public string name = String.Empty; 40 public string name = String.Empty;
41 41
@@ -43,4 +43,4 @@ namespace OpenSim.Framework.Communications.Capabilities
43 { 43 {
44 } 44 }
45 } 45 }
46} \ No newline at end of file 46}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index 507f12b..b14bfdd 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -86,8 +86,8 @@ namespace OpenSim.Framework.Communications.Capabilities
86 writer.WriteString(fieldName); 86 writer.WriteString(fieldName);
87 writer.WriteEndElement(); 87 writer.WriteEndElement();
88 LLSD.LLSDWriteOne(writer, fieldValue); 88 LLSD.LLSDWriteOne(writer, fieldValue);
89 // libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( 89 // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
90 // writer, libsecondlife.StructuredData.LLSD.FromObject(fieldValue)); 90 // writer, OpenMetaverse.StructuredData.LLSD.FromObject(fieldValue));
91 } 91 }
92 } 92 }
93 writer.WriteEndElement(); 93 writer.WriteEndElement();
@@ -111,8 +111,8 @@ namespace OpenSim.Framework.Communications.Capabilities
111 else 111 else
112 { 112 {
113 LLSD.LLSDWriteOne(writer, obj); 113 LLSD.LLSDWriteOne(writer, obj);
114 //libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( 114 //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
115 // writer, libsecondlife.StructuredData.LLSD.FromObject(obj)); 115 // writer, OpenMetaverse.StructuredData.LLSD.FromObject(obj));
116 } 116 }
117 } 117 }
118 118
@@ -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 libsecondlife.StructuredData.LLSDMap) 136 // if (enumerator.Value is OpenMetaverse.StructuredData.LLSDMap)
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 DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
141 // DeserialiseLLSDMap((libsecondlife.StructuredData.LLSDMap) enumerator.Value, fieldValue); 141 // DeserialiseLLSDMap((OpenMetaverse.StructuredData.LLSDMap) enumerator.Value, fieldValue);
142 } 142 }
143 else if (enumerator.Value is ArrayList) 143 else if (enumerator.Value is ArrayList)
144 { 144 {
@@ -160,4 +160,4 @@ namespace OpenSim.Framework.Communications.Capabilities
160 return obj; 160 return obj;
161 } 161 }
162 } 162 }
163} \ No newline at end of file 163}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index 1a75aba..ff36821 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -25,17 +25,17 @@
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
28using libsecondlife; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDInventoryItem 33 public class LLSDInventoryItem
34 { 34 {
35 public LLUUID parent_id; 35 public UUID parent_id;
36 36
37 public LLUUID asset_id; 37 public UUID asset_id;
38 public LLUUID item_id; 38 public UUID item_id;
39 public LLSDPermissions permissions; 39 public LLSDPermissions permissions;
40 public string type; 40 public string type;
41 public string inv_type; 41 public string inv_type;
@@ -50,9 +50,9 @@ namespace OpenSim.Framework.Communications.Capabilities
50 [LLSDMap] 50 [LLSDMap]
51 public class LLSDPermissions 51 public class LLSDPermissions
52 { 52 {
53 public LLUUID creator_id; 53 public UUID creator_id;
54 public LLUUID owner_id; 54 public UUID owner_id;
55 public LLUUID group_id; 55 public UUID group_id;
56 public int base_mask; 56 public int base_mask;
57 public int owner_mask; 57 public int owner_mask;
58 public int group_mask; 58 public int group_mask;
@@ -77,8 +77,8 @@ namespace OpenSim.Framework.Communications.Capabilities
77 [LLSDMap] 77 [LLSDMap]
78 public class LLSDFetchInventoryDescendents 78 public class LLSDFetchInventoryDescendents
79 { 79 {
80 public LLUUID folder_id; 80 public UUID folder_id;
81 public LLUUID owner_id; 81 public UUID owner_id;
82 public int sort_order; 82 public int sort_order;
83 public bool fetch_folders; 83 public bool fetch_folders;
84 public bool fetch_items; 84 public bool fetch_items;
@@ -87,11 +87,11 @@ namespace OpenSim.Framework.Communications.Capabilities
87 [LLSDMap] 87 [LLSDMap]
88 public class LLSDInventoryFolderContents 88 public class LLSDInventoryFolderContents
89 { 89 {
90 public LLUUID 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 LLUUID 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 LLSDArray items = new LLSDArray();
94 public LLUUID 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 }
97} \ No newline at end of file 97}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index 2c4b68f..c147bd3 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -25,17 +25,17 @@
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
28using libsecondlife; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
32 [LLSDMap] 32 [LLSDMap]
33 public class LLSDItemUpdate 33 public class LLSDItemUpdate
34 { 34 {
35 public LLUUID item_id; 35 public UUID item_id;
36 36
37 public LLSDItemUpdate() 37 public LLSDItemUpdate()
38 { 38 {
39 } 39 }
40 } 40 }
41} \ No newline at end of file 41}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index 50f5241..fc381e4 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.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
28using libsecondlife; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
@@ -36,10 +36,10 @@ namespace OpenSim.Framework.Communications.Capabilities
36 public int Right = 0; 36 public int Right = 0;
37 public int Top = 0; 37 public int Top = 0;
38 public int Bottom = 0; 38 public int Bottom = 0;
39 public LLUUID ImageID = LLUUID.Zero; 39 public UUID ImageID = UUID.Zero;
40 40
41 public LLSDMapLayer() 41 public LLSDMapLayer()
42 { 42 {
43 } 43 }
44 } 44 }
45} \ No newline at end of file 45}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
index b0e2b8f..1220089 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
@@ -26,14 +26,14 @@
26* 26*
27*/ 27*/
28 28
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework.Communications.Capabilities 31namespace OpenSim.Framework.Communications.Capabilities
32{ 32{
33 [LLSDType("MAP")] 33 [LLSDType("MAP")]
34 public class LLSDRemoteParcelResponse 34 public class LLSDRemoteParcelResponse
35 { 35 {
36 public LLUUID parcel_id; 36 public UUID parcel_id;
37 37
38 public LLSDRemoteParcelResponse() 38 public LLSDRemoteParcelResponse()
39 { 39 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 36090e1..7fcbb81 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Framework.Communications.Capabilities
53 //string requestBody = streamReader.ReadToEnd(); 53 //string requestBody = streamReader.ReadToEnd();
54 //streamReader.Close(); 54 //streamReader.Close();
55 55
56 // libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap) 56 // OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)
57 // libsecondlife.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();
@@ -67,4 +67,4 @@ namespace OpenSim.Framework.Communications.Capabilities
67 return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); 67 return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
68 } 68 }
69 } 69 }
70} \ No newline at end of file 70}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
index 8bfd20c..b34cbf9 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.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
28using libsecondlife; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
@@ -35,16 +35,16 @@ namespace OpenSim.Framework.Communications.Capabilities
35 /// <summary> 35 /// <summary>
36 /// The task inventory item that was updated 36 /// The task inventory item that was updated
37 /// </summary> 37 /// </summary>
38 public LLUUID item_id; 38 public UUID item_id;
39 39
40 /// <summary> 40 /// <summary>
41 /// The task that was updated 41 /// The task that was updated
42 /// </summary> 42 /// </summary>
43 public LLUUID task_id; 43 public UUID task_id;
44 44
45 /// <summary> 45 /// <summary>
46 /// State of the upload. So far have only even seen this set to "complete" 46 /// State of the upload. So far have only even seen this set to "complete"
47 /// </summary> 47 /// </summary>
48 public string state; 48 public string state;
49 } 49 }
50} \ No newline at end of file 50}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
index e45d9de..730e95b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.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
28using libsecondlife; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
31{ 31{
@@ -35,16 +35,16 @@ namespace OpenSim.Framework.Communications.Capabilities
35 /// <summary> 35 /// <summary>
36 /// The item containing the script to update 36 /// The item containing the script to update
37 /// </summary> 37 /// </summary>
38 public LLUUID item_id; 38 public UUID item_id;
39 39
40 /// <summary> 40 /// <summary>
41 /// The task containing the script 41 /// The task containing the script
42 /// </summary> 42 /// </summary>
43 public LLUUID task_id; 43 public UUID task_id;
44 44
45 /// <summary> 45 /// <summary>
46 /// Signals whether the script is currently active 46 /// Signals whether the script is currently active
47 /// </summary> 47 /// </summary>
48 public int is_script_running; 48 public int is_script_running;
49 } 49 }
50} \ No newline at end of file 50}