From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * 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. --- .../Framework/Communications/Capabilities/Caps.cs | 76 +++++++++++----------- .../Framework/Communications/Capabilities/LLSD.cs | 24 +++---- .../Capabilities/LLSDAssetUploadComplete.cs | 6 +- .../Capabilities/LLSDAssetUploadRequest.cs | 6 +- .../Communications/Capabilities/LLSDHelpers.cs | 14 ++-- .../Capabilities/LLSDInventoryItem.cs | 26 ++++---- .../Communications/Capabilities/LLSDItemUpdate.cs | 6 +- .../Communications/Capabilities/LLSDMapLayer.cs | 6 +- .../Capabilities/LLSDRemoteParcelResponse.cs | 4 +- .../Capabilities/LLSDStreamHandler.cs | 6 +- .../LLSDTaskInventoryUploadComplete.cs | 8 +-- .../Capabilities/LLSDTaskScriptUpdate.cs | 8 +-- 12 files changed, 95 insertions(+), 95 deletions(-) (limited to 'OpenSim/Framework/Communications/Capabilities') 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; using System.Collections.Generic; using System.IO; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; @@ -40,21 +40,21 @@ using OpenSim.Region.Interfaces; namespace OpenSim.Framework.Communications.Capabilities { public delegate void UpLoadedAsset( - string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, + string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, string assetType); - public delegate LLUUID UpdateItem(LLUUID itemID, byte[] data); + public delegate UUID UpdateItem(UUID itemID, byte[] data); - public delegate void UpdateTaskScript(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data); + public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data); - public delegate void NewInventoryItem(LLUUID userID, InventoryItemBase item); + public delegate void NewInventoryItem(UUID userID, InventoryItemBase item); - public delegate LLUUID ItemUpdatedCallback(LLUUID userID, LLUUID itemID, byte[] data); + public delegate UUID ItemUpdatedCallback(UUID userID, UUID itemID, byte[] data); - public delegate void TaskScriptUpdatedCallback(LLUUID userID, LLUUID itemID, LLUUID primID, + public delegate void TaskScriptUpdatedCallback(UUID userID, UUID itemID, UUID primID, bool isScriptRunning, byte[] data); - public delegate List FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, + public delegate List FetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder); /// @@ -62,7 +62,7 @@ namespace OpenSim.Framework.Communications.Capabilities /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want /// to just pass the whole Scene into CAPS. /// - public delegate IClientAPI GetClientDelegate(LLUUID agentID); + public delegate IClientAPI GetClientDelegate(UUID agentID); public class Caps { @@ -97,7 +97,7 @@ namespace OpenSim.Framework.Communications.Capabilities //private string eventQueue = "0100/"; private BaseHttpServer m_httpListener; - private LLUUID m_agentID; + private UUID m_agentID; private AssetCache m_assetCache; private int m_eventQueueCount = 1; private Queue m_capsEventQueue = new Queue(); @@ -113,7 +113,7 @@ namespace OpenSim.Framework.Communications.Capabilities public GetClientDelegate GetClient = null; public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, - LLUUID agent, bool dumpAssetsToFile, string regionName) + UUID agent, bool dumpAssetsToFile, string regionName) { m_assetCache = assetCache; m_capsObjectPath = capsPath; @@ -258,7 +258,7 @@ namespace OpenSim.Framework.Communications.Capabilities Hashtable hash = new Hashtable(); try { - hash = (Hashtable)LLSD.LLSDDeserialize(Helpers.StringToField(request)); + hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); } catch (LLSD.LLSDParseException pe) { @@ -388,7 +388,7 @@ namespace OpenSim.Framework.Communications.Capabilities llsdItem.permissions.creator_id = invItem.Creator; llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions; - llsdItem.permissions.group_id = LLUUID.Zero; + llsdItem.permissions.group_id = UUID.Zero; llsdItem.permissions.group_mask = 0; llsdItem.permissions.is_owner_group = false; llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions; @@ -423,7 +423,7 @@ namespace OpenSim.Framework.Communications.Capabilities LLSDMapLayer mapLayer = new LLSDMapLayer(); mapLayer.Right = 5000; mapLayer.Top = 5000; - mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); + mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006"); return mapLayer; } @@ -522,7 +522,7 @@ namespace OpenSim.Framework.Communications.Capabilities m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName); //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); - Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); + Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest); @@ -573,8 +573,8 @@ namespace OpenSim.Framework.Communications.Capabilities OSHttpRequest httpRequest, OSHttpResponse httpResponse) { m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); - //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); - Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); + //OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request)); + Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); @@ -636,9 +636,9 @@ namespace OpenSim.Framework.Communications.Capabilities string assetName = llsdRequest.name; string assetDes = llsdRequest.description; string capsBase = "/CAPS/" + m_capsObjectPath; - LLUUID newAsset = LLUUID.Random(); - LLUUID newInvItem = LLUUID.Random(); - LLUUID parentFolder = llsdRequest.folder_id; + UUID newAsset = UUID.Random(); + UUID newInvItem = UUID.Random(); + UUID parentFolder = llsdRequest.folder_id; string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); AssetUploader uploader = @@ -662,8 +662,8 @@ namespace OpenSim.Framework.Communications.Capabilities /// /// /// - public void UploadCompleteHandler(string assetName, string assetDescription, LLUUID assetID, - LLUUID inventoryItem, LLUUID parentFolder, byte[] data, string inventoryType, + public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, + UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, string assetType) { sbyte assType = 0; @@ -728,14 +728,14 @@ namespace OpenSim.Framework.Communications.Capabilities /// Item to update /// New asset data /// - public LLUUID ItemUpdated(LLUUID itemID, byte[] data) + public UUID ItemUpdated(UUID itemID, byte[] data) { if (ItemUpdatedCall != null) { return ItemUpdatedCall(m_agentID, itemID, data); } - return LLUUID.Zero; + return UUID.Zero; } /// @@ -745,7 +745,7 @@ namespace OpenSim.Framework.Communications.Capabilities /// Prim containing item to update /// Signals whether the script to update is currently running /// New asset data - public void TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data) + public void TaskScriptUpdated(UUID itemID, UUID primID, bool isScriptRunning, byte[] data) { if (TaskScriptUpdatedCall != null) { @@ -759,9 +759,9 @@ namespace OpenSim.Framework.Communications.Capabilities private UpLoadedAsset handlerUpLoad = null; private string uploaderPath = String.Empty; - private LLUUID newAssetID; - private LLUUID inventoryItemID; - private LLUUID parentFolder; + private UUID newAssetID; + private UUID inventoryItemID; + private UUID parentFolder; private BaseHttpServer httpListener; private bool m_dumpAssetsToFile; private string m_assetName = String.Empty; @@ -770,8 +770,8 @@ namespace OpenSim.Framework.Communications.Capabilities private string m_invType = String.Empty; private string m_assetType = String.Empty; - public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, - LLUUID parentFolderID, string invType, string assetType, string path, + public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, + UUID parentFolderID, string invType, string assetType, string path, BaseHttpServer httpServer, bool dumpAssetsToFile) { m_assetName = assetName; @@ -795,7 +795,7 @@ namespace OpenSim.Framework.Communications.Capabilities /// public string uploaderCaps(byte[] data, string path, string param) { - LLUUID inv = inventoryItemID; + UUID inv = inventoryItemID; string res = String.Empty; LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); uploadComplete.new_asset = newAssetID.ToString(); @@ -860,11 +860,11 @@ namespace OpenSim.Framework.Communications.Capabilities private UpdateItem handlerUpdateItem = null; private string uploaderPath = String.Empty; - private LLUUID inventoryItemID; + private UUID inventoryItemID; private BaseHttpServer httpListener; private bool m_dumpAssetToFile; - public ItemUpdater(LLUUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile) + public ItemUpdater(UUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile) { m_dumpAssetToFile = dumpAssetToFile; @@ -882,10 +882,10 @@ namespace OpenSim.Framework.Communications.Capabilities /// public string uploaderCaps(byte[] data, string path, string param) { - LLUUID inv = inventoryItemID; + UUID inv = inventoryItemID; string res = String.Empty; LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); - LLUUID assetID = LLUUID.Zero; + UUID assetID = UUID.Zero; handlerUpdateItem = OnUpLoad; if (handlerUpdateItem != null) { @@ -942,13 +942,13 @@ namespace OpenSim.Framework.Communications.Capabilities private UpdateTaskScript handlerUpdateTaskScript = null; private string uploaderPath = String.Empty; - private LLUUID inventoryItemID; - private LLUUID primID; + private UUID inventoryItemID; + private UUID primID; private bool isScriptRunning; private BaseHttpServer httpListener; private bool m_dumpAssetToFile; - public TaskInventoryScriptUpdater(LLUUID inventoryItemID, LLUUID primID, int isScriptRunning, + public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, int isScriptRunning, string path, BaseHttpServer httpServer, bool dumpAssetToFile) { 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; using System.Security.Cryptography; using System.Text; using System.Xml; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { @@ -158,9 +158,9 @@ namespace OpenSim.Framework.Communications.Capabilities { throw new Exception("ulong in LLSD is currently not implemented, fix me!"); } - else if (obj is LLUUID) + else if (obj is UUID) { - LLUUID u = (LLUUID) obj; + UUID u = (UUID) obj; writer.WriteStartElement(String.Empty, "uuid", String.Empty); writer.WriteString(u.ToString()); writer.WriteEndElement(); @@ -294,11 +294,11 @@ namespace OpenSim.Framework.Communications.Capabilities if (reader.IsEmptyElement) { reader.Read(); - return LLUUID.Zero; + return UUID.Zero; } reader.Read(); - ret = new LLUUID(reader.ReadString().Trim()); + ret = new UUID(reader.ReadString().Trim()); break; } case "string": @@ -476,9 +476,9 @@ namespace OpenSim.Framework.Communications.Capabilities { return GetSpaces(indent) + "- float " + obj.ToString() + "\n"; } - else if (obj is LLUUID) + else if (obj is UUID) { - return GetSpaces(indent) + "- uuid " + ((LLUUID) obj).ToString() + Environment.NewLine; + return GetSpaces(indent) + "- uuid " + ((UUID) obj).ToString() + Environment.NewLine; } else if (obj is Hashtable) { @@ -509,7 +509,7 @@ namespace OpenSim.Framework.Communications.Capabilities } else if (obj is byte[]) { - return GetSpaces(indent) + "- binary\n" + Helpers.FieldToHexString((byte[]) obj, GetSpaces(indent)) + + return GetSpaces(indent) + "- binary\n" + Utils.BytesToHexString((byte[]) obj, GetSpaces(indent)) + Environment.NewLine; } else @@ -568,14 +568,14 @@ namespace OpenSim.Framework.Communications.Capabilities } case 'u': { - if (llsd.Length < 17) throw new LLSDParseException("LLUUID value type with no value"); - LLUUID value; + if (llsd.Length < 17) throw new LLSDParseException("UUID value type with no value"); + UUID value; endPos = FindEnd(llsd, 1); - if (LLUUID.TryParse(llsd.Substring(1, endPos - 1), out value)) + if (UUID.TryParse(llsd.Substring(1, endPos - 1), out value)) return value; else - throw new LLSDParseException("Failed to parse LLUUID value type"); + throw new LLSDParseException("Failed to parse UUID value type"); } case 'b': //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 @@ */ using System; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { @@ -34,7 +34,7 @@ namespace OpenSim.Framework.Communications.Capabilities public class LLSDAssetUploadComplete { public string new_asset = String.Empty; - public LLUUID new_inventory_item = LLUUID.Zero; + public UUID new_inventory_item = UUID.Zero; public string state = String.Empty; //public bool success = false; @@ -42,4 +42,4 @@ namespace OpenSim.Framework.Communications.Capabilities { } } -} \ No newline at end of file +} 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 @@ */ using System; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { @@ -35,7 +35,7 @@ namespace OpenSim.Framework.Communications.Capabilities { public string asset_type = String.Empty; public string description = String.Empty; - public LLUUID folder_id = LLUUID.Zero; + public UUID folder_id = UUID.Zero; public string inventory_type = String.Empty; public string name = String.Empty; @@ -43,4 +43,4 @@ namespace OpenSim.Framework.Communications.Capabilities { } } -} \ No newline at end of file +} 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 writer.WriteString(fieldName); writer.WriteEndElement(); LLSD.LLSDWriteOne(writer, fieldValue); - // libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( - // writer, libsecondlife.StructuredData.LLSD.FromObject(fieldValue)); + // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( + // writer, OpenMetaverse.StructuredData.LLSD.FromObject(fieldValue)); } } writer.WriteEndElement(); @@ -111,8 +111,8 @@ namespace OpenSim.Framework.Communications.Capabilities else { LLSD.LLSDWriteOne(writer, obj); - //libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( - // writer, libsecondlife.StructuredData.LLSD.FromObject(obj)); + //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( + // writer, OpenMetaverse.StructuredData.LLSD.FromObject(obj)); } } @@ -133,12 +133,12 @@ namespace OpenSim.Framework.Communications.Capabilities FieldInfo field = myType.GetField(keyName); if (field != null) { - // if (enumerator.Value is libsecondlife.StructuredData.LLSDMap) + // if (enumerator.Value is OpenMetaverse.StructuredData.LLSDMap) if (enumerator.Value is Hashtable) { object fieldValue = field.GetValue(obj); DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue); - // DeserialiseLLSDMap((libsecondlife.StructuredData.LLSDMap) enumerator.Value, fieldValue); + // DeserialiseLLSDMap((OpenMetaverse.StructuredData.LLSDMap) enumerator.Value, fieldValue); } else if (enumerator.Value is ArrayList) { @@ -160,4 +160,4 @@ namespace OpenSim.Framework.Communications.Capabilities return obj; } } -} \ No newline at end of file +} 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { [LLSDMap] public class LLSDInventoryItem { - public LLUUID parent_id; + public UUID parent_id; - public LLUUID asset_id; - public LLUUID item_id; + public UUID asset_id; + public UUID item_id; public LLSDPermissions permissions; public string type; public string inv_type; @@ -50,9 +50,9 @@ namespace OpenSim.Framework.Communications.Capabilities [LLSDMap] public class LLSDPermissions { - public LLUUID creator_id; - public LLUUID owner_id; - public LLUUID group_id; + public UUID creator_id; + public UUID owner_id; + public UUID group_id; public int base_mask; public int owner_mask; public int group_mask; @@ -77,8 +77,8 @@ namespace OpenSim.Framework.Communications.Capabilities [LLSDMap] public class LLSDFetchInventoryDescendents { - public LLUUID folder_id; - public LLUUID owner_id; + public UUID folder_id; + public UUID owner_id; public int sort_order; public bool fetch_folders; public bool fetch_items; @@ -87,11 +87,11 @@ namespace OpenSim.Framework.Communications.Capabilities [LLSDMap] public class LLSDInventoryFolderContents { - public LLUUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" + public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" public int descendents; - public LLUUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names + public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names public LLSDArray items = new LLSDArray(); - public LLUUID owner___id; // and of course we can't have field names with "-" in + public UUID owner___id; // and of course we can't have field names with "-" in public int version; } -} \ No newline at end of file +} 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { [LLSDMap] public class LLSDItemUpdate { - public LLUUID item_id; + public UUID item_id; public LLSDItemUpdate() { } } -} \ No newline at end of file +} 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { @@ -36,10 +36,10 @@ namespace OpenSim.Framework.Communications.Capabilities public int Right = 0; public int Top = 0; public int Bottom = 0; - public LLUUID ImageID = LLUUID.Zero; + public UUID ImageID = UUID.Zero; public LLSDMapLayer() { } } -} \ No newline at end of file +} 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 @@ * */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { [LLSDType("MAP")] public class LLSDRemoteParcelResponse { - public LLUUID parcel_id; + public UUID parcel_id; public LLSDRemoteParcelResponse() { 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 //string requestBody = streamReader.ReadToEnd(); //streamReader.Close(); - // libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap) - // libsecondlife.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); + // OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap) + // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); TRequest llsdRequest = new TRequest(); @@ -67,4 +67,4 @@ namespace OpenSim.Framework.Communications.Capabilities return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); } } -} \ No newline at end of file +} 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { @@ -35,16 +35,16 @@ namespace OpenSim.Framework.Communications.Capabilities /// /// The task inventory item that was updated /// - public LLUUID item_id; + public UUID item_id; /// /// The task that was updated /// - public LLUUID task_id; + public UUID task_id; /// /// State of the upload. So far have only even seen this set to "complete" /// public string state; } -} \ No newline at end of file +} 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities { @@ -35,16 +35,16 @@ namespace OpenSim.Framework.Communications.Capabilities /// /// The item containing the script to update /// - public LLUUID item_id; + public UUID item_id; /// /// The task containing the script /// - public LLUUID task_id; + public UUID task_id; /// /// Signals whether the script is currently active /// public int is_script_running; } -} \ No newline at end of file +} -- cgit v1.1