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. --- .../Communications/Local/LocalBackEndServices.cs | 26 +++---- .../Communications/Local/LocalInventoryService.cs | 8 +-- .../Communications/Local/LocalLoginService.cs | 12 ++-- .../Communications/Local/LocalUserServices.cs | 4 +- .../Region/Communications/OGS1/OGS1GridServices.cs | 74 +++++++++---------- .../Communications/OGS1/OGS1InterSimComms.cs | 34 ++++----- .../Communications/OGS1/OGS1InventoryService.cs | 18 ++--- .../OGS1/OGS1SecureInventoryService.cs | 32 ++++----- .../Region/Communications/OGS1/OGS1UserServices.cs | 82 +++++++++++----------- 9 files changed, 145 insertions(+), 145 deletions(-) (limited to 'OpenSim/Region/Communications') diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index a2c3c2c..aabddc6 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -29,7 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; @@ -177,7 +177,7 @@ namespace OpenSim.Region.Communications.Local return null; } - public RegionInfo RequestNeighbourInfo(LLUUID regionID) + public RegionInfo RequestNeighbourInfo(UUID regionID) { // TODO add a dictionary for faster lookup foreach (RegionInfo info in m_regions.Values) @@ -229,7 +229,7 @@ namespace OpenSim.Region.Communications.Local return mapBlocks; } - public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) + public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -306,7 +306,7 @@ namespace OpenSim.Region.Communications.Local return false; } - public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) + public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -338,7 +338,7 @@ namespace OpenSim.Region.Communications.Local return false; } - public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) + public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -355,7 +355,7 @@ namespace OpenSim.Region.Communications.Local /// /// /// - public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) + public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -366,7 +366,7 @@ namespace OpenSim.Region.Communications.Local return false; } - public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) + public bool ExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -376,7 +376,7 @@ namespace OpenSim.Region.Communications.Local return false; } - public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) + public bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -385,7 +385,7 @@ namespace OpenSim.Region.Communications.Local return false; } - public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) + public bool AcknowledgePrimCrossed(ulong regionHandle, UUID primID) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -430,7 +430,7 @@ namespace OpenSim.Region.Communications.Local } } - public void TriggerLogOffUser(ulong regionHandle, LLUUID agentID, LLUUID RegionSecret, string message) + public void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -440,7 +440,7 @@ namespace OpenSim.Region.Communications.Local } } - public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) + public void TriggerExpectPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -461,7 +461,7 @@ namespace OpenSim.Region.Communications.Local } } - public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) + public bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) { if (m_regionListeners.ContainsKey(regionHandle)) { @@ -472,7 +472,7 @@ namespace OpenSim.Region.Communications.Local return false; } - public bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) + public bool TriggerExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical) { if (m_regionListeners.ContainsKey(regionHandle)) { diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 1d8ea53..5cb33cc 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; @@ -44,7 +44,7 @@ namespace OpenSim.Region.Communications.Local private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) + public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback) { m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID); @@ -60,7 +60,7 @@ namespace OpenSim.Region.Communications.Local // Need to retrieve the root folder on the first pass foreach (InventoryFolderBase folder in skeletonFolders) { - if (folder.ParentID == LLUUID.Zero) + if (folder.ParentID == UUID.Zero) { rootFolder = new InventoryFolderImpl(folder); folders.Add(rootFolder); @@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local callback(folders, items); } - public override bool HasInventoryForUser(LLUUID userID) + public override bool HasInventoryForUser(UUID userID) { InventoryFolderBase root = RequestRootFolder(userID); if (root == null) diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index aeb9ae0..518ba09 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -30,7 +30,7 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; @@ -246,9 +246,9 @@ namespace OpenSim.Region.Communications.Local _login.SecureSession = response.SecureSessionID; _login.CircuitCode = (uint) response.CircuitCode; if (specificStartLocation) - _login.StartPos = new LLVector3(locX, locY, locZ); + _login.StartPos = new Vector3(locX, locY, locZ); else - _login.StartPos = new LLVector3(128, 128, 128); + _login.StartPos = new Vector3(128, 128, 128); _login.CapsPath = capsPath; m_log.InfoFormat( @@ -282,7 +282,7 @@ namespace OpenSim.Region.Communications.Local } // See LoginService - protected override InventoryData GetInventorySkeleton(LLUUID userID) + protected override InventoryData GetInventorySkeleton(UUID userID) { List folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); @@ -293,12 +293,12 @@ namespace OpenSim.Region.Communications.Local folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); } - LLUUID rootID = LLUUID.Zero; + UUID rootID = UUID.Zero; ArrayList AgentInventoryArray = new ArrayList(); Hashtable TempHash; foreach (InventoryFolderBase InvFolder in folders) { - if (InvFolder.ParentID == LLUUID.Zero) + if (InvFolder.ParentID == UUID.Zero) { rootID = InvFolder.ID; } diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 2ee7981..c0887df 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs @@ -26,7 +26,7 @@ */ using System; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; @@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local return profile; } - public override UserProfileData SetupMasterUser(LLUUID uuid) + public override UserProfileData SetupMasterUser(UUID uuid) { UserProfileData data = GetUserProfile(uuid); if (data == null) diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index da2e4a2..1dd4219 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -37,7 +37,7 @@ using System.Runtime.Remoting.Channels; using System.Runtime.Remoting.Channels.Tcp; using System.Security.Authentication; using System.Threading; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; using OpenSim.Framework; @@ -125,7 +125,7 @@ namespace OpenSim.Region.Communications.OGS1 GridParams["server_uri"] = regionInfo.ServerURI; GridParams["region_secret"] = regionInfo.regionSecret; - if (regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) + if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero) GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); else GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); @@ -275,7 +275,7 @@ namespace OpenSim.Region.Communications.OGS1 sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]); } - sri.RegionID = new LLUUID((string) neighbourData["uuid"]); + sri.RegionID = new UUID((string) neighbourData["uuid"]); neighbours.Add(sri); } @@ -294,7 +294,7 @@ namespace OpenSim.Region.Communications.OGS1 /// FIXME: Might be nicer to return a proper exception here since we could inform the client more about the /// nature of the faiulre. /// - public RegionInfo RequestNeighbourInfo(LLUUID Region_UUID) + public RegionInfo RequestNeighbourInfo(UUID Region_UUID) { RegionInfo regionInfo; Hashtable requestData = new Hashtable(); @@ -344,7 +344,7 @@ namespace OpenSim.Region.Communications.OGS1 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); } - regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]); + regionInfo.RegionID = new UUID((string) responseData["region_UUID"]); regionInfo.RegionName = (string) responseData["region_name"]; if (requestData.ContainsKey("regionHandle")) @@ -407,7 +407,7 @@ namespace OpenSim.Region.Communications.OGS1 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); } - regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]); + regionInfo.RegionID = new UUID((string) responseData["region_UUID"]); regionInfo.RegionName = (string) responseData["region_name"]; lock (m_remoteRegionInfoCache) @@ -475,7 +475,7 @@ namespace OpenSim.Region.Communications.OGS1 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); } - regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]); + regionInfo.RegionID = new UUID((string) responseData["region_UUID"]); regionInfo.RegionName = (string) responseData["region_name"]; if (!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle)) @@ -533,7 +533,7 @@ namespace OpenSim.Region.Communications.OGS1 neighbour.Access = Convert.ToByte(n["access"]); neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]); neighbour.WaterHeight = Convert.ToByte(n["water-height"]); - neighbour.MapImageId = new LLUUID((string) n["map-image-id"]); + neighbour.MapImageId = new UUID((string) n["map-image-id"]); neighbours.Add(neighbour); } @@ -606,11 +606,11 @@ namespace OpenSim.Region.Communications.OGS1 m_log.Debug("[CONNECTION DEBUGGING]: Expect User called, starting agent setup ... "); Hashtable requestData = (Hashtable) request.Params[0]; AgentCircuitData agentData = new AgentCircuitData(); - agentData.SessionID = new LLUUID((string) requestData["session_id"]); - agentData.SecureSessionID = new LLUUID((string) requestData["secure_session_id"]); + agentData.SessionID = new UUID((string) requestData["session_id"]); + agentData.SecureSessionID = new UUID((string) requestData["secure_session_id"]); agentData.firstname = (string) requestData["firstname"]; agentData.lastname = (string) requestData["lastname"]; - agentData.AgentID = new LLUUID((string) requestData["agent_id"]); + agentData.AgentID = new UUID((string) requestData["agent_id"]); agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); agentData.CapsPath = (string) requestData["caps_path"]; @@ -623,7 +623,7 @@ namespace OpenSim.Region.Communications.OGS1 { m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected"); agentData.startpos = - new LLVector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), + new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), (float)Convert.ToDecimal((string)requestData["startpos_y"]), (float)Convert.ToDecimal((string)requestData["startpos_z"])); agentData.child = false; @@ -684,10 +684,10 @@ namespace OpenSim.Region.Communications.OGS1 m_log.Debug("[CONNECTION DEBUGGING]: LogOff User Called "); Hashtable requestData = (Hashtable)request.Params[0]; string message = (string)requestData["message"]; - LLUUID agentID = LLUUID.Zero; - LLUUID RegionSecret = LLUUID.Zero; - Helpers.TryParse((string)requestData["agent_id"], out agentID); - Helpers.TryParse((string)requestData["region_secret"], out RegionSecret); + UUID agentID = UUID.Zero; + UUID RegionSecret = UUID.Zero; + UUID.TryParse((string)requestData["agent_id"], out agentID); + UUID.TryParse((string)requestData["region_secret"], out RegionSecret); ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]); @@ -1072,7 +1072,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) + public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod) { int failures = 0; lock (m_deadRegionCache) @@ -1106,7 +1106,7 @@ namespace OpenSim.Region.Communications.OGS1 if (remObject != null) { - retValue = remObject.InformRegionOfPrimCrossing(regionHandle, primID.UUID, objData, XMLMethod); + retValue = remObject.InformRegionOfPrimCrossing(regionHandle, primID.Guid, objData, XMLMethod); } else { @@ -1168,7 +1168,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) + public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) { RegionInfo[] regions = m_regionsOnInstance.ToArray(); bool banned = false; @@ -1212,7 +1212,7 @@ namespace OpenSim.Region.Communications.OGS1 if (remObject != null) { retValue = - remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), + remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, position, isFlying); } else @@ -1246,7 +1246,7 @@ namespace OpenSim.Region.Communications.OGS1 } } - public bool ExpectPrimCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isPhysical) + public bool ExpectPrimCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isPhysical) { RegionInfo regInfo = null; try @@ -1269,7 +1269,7 @@ namespace OpenSim.Region.Communications.OGS1 if (remObject != null) { retValue = - remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), + remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, position, isPhysical); } else @@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Communications.OGS1 } } - public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) + public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) { RegionInfo regInfo = null; try @@ -1345,7 +1345,7 @@ namespace OpenSim.Region.Communications.OGS1 if (remObject != null) { // retValue = - remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID); + remObject.TellRegionToCloseChildConnection(regionHandle, agentID.Guid); } else { @@ -1421,12 +1421,12 @@ namespace OpenSim.Region.Communications.OGS1 } } - public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) + public bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId) { return m_localBackend.AcknowledgeAgentCrossed(regionHandle, agentId); } - public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primId) + public bool AcknowledgePrimCrossed(ulong regionHandle, UUID primId) { return m_localBackend.AcknowledgePrimCrossed(regionHandle, primId); } @@ -1509,7 +1509,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) + public bool IncomingPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod) { // Is this necessary? try @@ -1532,7 +1532,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) + public bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) { try { @@ -1545,7 +1545,7 @@ namespace OpenSim.Region.Communications.OGS1 } } - public bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isPhysical) + public bool TriggerExpectPrimCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isPhysical) { try { @@ -1558,7 +1558,7 @@ namespace OpenSim.Region.Communications.OGS1 } } - public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) + public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) { try { @@ -1692,18 +1692,18 @@ namespace OpenSim.Region.Communications.OGS1 hash = (Hashtable)response.Value; try { landData = new LandData(); - landData.AABBMax = LLVector3.Parse((string)hash["AABBMax"]); - landData.AABBMin = LLVector3.Parse((string)hash["AABBMin"]); + landData.AABBMax = Vector3.Parse((string)hash["AABBMax"]); + landData.AABBMin = Vector3.Parse((string)hash["AABBMin"]); landData.Area = Convert.ToInt32(hash["Area"]); landData.AuctionID = Convert.ToUInt32(hash["AuctionID"]); landData.Description = (string)hash["Description"]; landData.Flags = Convert.ToUInt32(hash["Flags"]); - landData.GlobalID = new LLUUID((string)hash["GlobalID"]); + landData.GlobalID = new UUID((string)hash["GlobalID"]); landData.Name = (string)hash["Name"]; - landData.OwnerID = new LLUUID((string)hash["OwnerID"]); + landData.OwnerID = new UUID((string)hash["OwnerID"]); landData.SalePrice = Convert.ToInt32(hash["SalePrice"]); - landData.SnapshotID = new LLUUID((string)hash["SnapshotID"]); - landData.UserLocation = LLVector3.Parse((string)hash["UserLocation"]); + landData.SnapshotID = new UUID((string)hash["SnapshotID"]); + landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name); } catch (Exception e) @@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Communications.OGS1 if (landData != null) { // for now, only push out the data we need for answering a ParcelInfoReqeust - // FIXME: these Replace calls are necessary as LLVector3.Parse can't parse vectors with spaces in them. Can be removed as soon as we switch to a newer version + // FIXME: these Replace calls are necessary as Vector3.Parse can't parse vectors with spaces in them. Can be removed as soon as we switch to a newer version hash["AABBMax"] = landData.AABBMax.ToString().Replace(" ", ""); hash["AABBMin"] = landData.AABBMin.ToString().Replace(" ", ""); hash["Area"] = landData.Area.ToString(); diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index 8285fb1..1f0c067 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs @@ -28,7 +28,7 @@ using System; using System.Reflection; using System.Runtime.Remoting; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; @@ -36,17 +36,17 @@ namespace OpenSim.Region.Communications.OGS1 { public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); - public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); + public delegate bool ExpectArrival(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying); - public delegate bool InformRegionPrimGroup(ulong regionHandle, LLUUID primID, LLVector3 Positon, bool isPhysical); + public delegate bool InformRegionPrimGroup(ulong regionHandle, UUID primID, Vector3 Positon, bool isPhysical); - public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); + public delegate bool PrimGroupArrival(ulong regionHandle, UUID primID, string objData, int XMLMethod); public delegate bool RegionUp(RegionUpData region, ulong regionhandle); public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate); - public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID); + public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID); public sealed class InterRegionSingleton { @@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) + public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) { handlerArrival = OnArrival; if (handlerArrival != null) @@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) + public bool InformRegionPrim(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical) { handlerPrimGroupNear = OnPrimGroupNear; if (handlerPrimGroupNear != null) @@ -132,7 +132,7 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) + public bool ExpectPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod) { handlerPrimGroupArrival = OnPrimGroupArrival; if (handlerPrimGroupArrival != null) @@ -142,7 +142,7 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) + public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) { handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection; if (handlerTellRegionToCloseChildConnection != null) @@ -202,13 +202,13 @@ namespace OpenSim.Region.Communications.OGS1 } - public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying) + public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, Vector3 position, bool isFlying) { try { return - InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), - new LLVector3(position.x, position.y, position.z), + InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new UUID(agentID), + position, isFlying); } catch (RemotingException e) @@ -218,13 +218,13 @@ namespace OpenSim.Region.Communications.OGS1 } } - public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical) + public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, Vector3 position, bool isPhysical) { try { return - InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), - new LLVector3(position.x, position.y, position.z), + InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new UUID(SceneObjectGroupID), + position, isPhysical); } catch (RemotingException e) @@ -238,7 +238,7 @@ namespace OpenSim.Region.Communications.OGS1 { try { - return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData, XMLMethod); + return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new UUID(primID), objData, XMLMethod); } catch (RemotingException e) { @@ -251,7 +251,7 @@ namespace OpenSim.Region.Communications.OGS1 { try { - return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID)); + return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new UUID(agentID)); } catch (RemotingException) { diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 2828928..b9e8394 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Net; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; @@ -46,8 +46,8 @@ namespace OpenSim.Region.Communications.OGS1 private string _inventoryServerUrl; private Uri m_Uri; - private Dictionary m_RequestingInventory - = new Dictionary(); + private Dictionary m_RequestingInventory + = new Dictionary(); public OGS1InventoryService(string inventoryServerUrl) { @@ -67,7 +67,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) + public void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback) { if (!m_RequestingInventory.ContainsKey(userID)) { @@ -83,7 +83,7 @@ namespace OpenSim.Region.Communications.OGS1 = new RestObjectPosterResponse(); requester.ResponseCallback = InventoryResponse; - requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.UUID); + requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.Guid); } catch (WebException e) { @@ -106,7 +106,7 @@ namespace OpenSim.Region.Communications.OGS1 /// private void InventoryResponse(InventoryCollection response) { - LLUUID userID = response.UserID; + UUID userID = response.UserID; if (m_RequestingInventory.ContainsKey(userID)) { m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + @@ -121,7 +121,7 @@ namespace OpenSim.Region.Communications.OGS1 foreach (InventoryFolderBase folder in response.Folders) { - if (folder.ParentID == LLUUID.Zero) + if (folder.ParentID == UUID.Zero) { rootFolder = new InventoryFolderImpl(folder); folders.Add(rootFolder); @@ -296,12 +296,12 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool HasInventoryForUser(LLUUID userID) + public bool HasInventoryForUser(UUID userID) { return false; } - public InventoryFolderBase RequestRootFolder(LLUUID userID) + public InventoryFolderBase RequestRootFolder(UUID userID) { return null; } diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs index 26521ab..c690def 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Net; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; @@ -46,8 +46,8 @@ namespace OpenSim.Region.Communications.OGS1 private string _inventoryServerUrl; private Uri m_Uri; - private Dictionary m_RequestingInventory - = new Dictionary(); + private Dictionary m_RequestingInventory + = new Dictionary(); public OGS1SecureInventoryService(string inventoryServerUrl) { @@ -67,7 +67,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public void RequestInventoryForUser(LLUUID userID, LLUUID session_id, InventoryReceiptCallback callback) + public void RequestInventoryForUser(UUID userID, UUID session_id, InventoryReceiptCallback callback) { if (!m_RequestingInventory.ContainsKey(userID)) { @@ -83,7 +83,7 @@ namespace OpenSim.Region.Communications.OGS1 = new RestSessionObjectPosterResponse(); requester.ResponseCallback = InventoryResponse; - requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.UUID, session_id.ToString(), userID.ToString()); + requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.Guid, session_id.ToString(), userID.ToString()); } catch (WebException e) { @@ -106,7 +106,7 @@ namespace OpenSim.Region.Communications.OGS1 /// private void InventoryResponse(InventoryCollection response) { - LLUUID userID = response.UserID; + UUID userID = response.UserID; if (m_RequestingInventory.ContainsKey(userID)) { m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + @@ -121,7 +121,7 @@ namespace OpenSim.Region.Communications.OGS1 foreach (InventoryFolderBase folder in response.Folders) { - if (folder.ParentID == LLUUID.Zero) + if (folder.ParentID == UUID.Zero) { rootFolder = new InventoryFolderImpl(folder); folders.Add(rootFolder); @@ -166,7 +166,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool AddFolder(InventoryFolderBase folder, LLUUID session_id) + public bool AddFolder(InventoryFolderBase folder, UUID session_id) { try { @@ -186,7 +186,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool UpdateFolder(InventoryFolderBase folder, LLUUID session_id) + public bool UpdateFolder(InventoryFolderBase folder, UUID session_id) { try { @@ -206,7 +206,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool MoveFolder(InventoryFolderBase folder, LLUUID session_id) + public bool MoveFolder(InventoryFolderBase folder, UUID session_id) { try { @@ -225,7 +225,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool PurgeFolder(InventoryFolderBase folder, LLUUID session_id) + public bool PurgeFolder(InventoryFolderBase folder, UUID session_id) { try { @@ -244,7 +244,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool AddItem(InventoryItemBase item, LLUUID session_id) + public bool AddItem(InventoryItemBase item, UUID session_id) { try { @@ -261,7 +261,7 @@ namespace OpenSim.Region.Communications.OGS1 } // TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented - public bool UpdateItem(InventoryItemBase item, LLUUID session_id) + public bool UpdateItem(InventoryItemBase item, UUID session_id) { try { @@ -280,7 +280,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public bool DeleteItem(InventoryItemBase item, LLUUID session_id) + public bool DeleteItem(InventoryItemBase item, UUID session_id) { try { @@ -296,12 +296,12 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool HasInventoryForUser(LLUUID userID) + public bool HasInventoryForUser(UUID userID) { return false; } - public InventoryFolderBase RequestRootFolder(LLUUID userID) + public InventoryFolderBase RequestRootFolder(UUID userID) { return null; } diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 2223aeb..317be13 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Net; using System.Reflection; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; using OpenSim.Framework; @@ -64,27 +64,27 @@ namespace OpenSim.Region.Communications.OGS1 UserProfileData userData = new UserProfileData(); userData.FirstName = (string) data["firstname"]; userData.SurName = (string) data["lastname"]; - userData.ID = new LLUUID((string) data["uuid"]); + userData.ID = new UUID((string) data["uuid"]); userData.UserInventoryURI = (string) data["server_inventory"]; userData.UserAssetURI = (string) data["server_asset"]; userData.FirstLifeAboutText = (string) data["profile_firstlife_about"]; - userData.FirstLifeImage = new LLUUID((string) data["profile_firstlife_image"]); + userData.FirstLifeImage = new UUID((string) data["profile_firstlife_image"]); userData.CanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]); userData.AboutText = (string)data["profile_about"]; - userData.Image = new LLUUID((string) data["profile_image"]); + userData.Image = new UUID((string) data["profile_image"]); userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); if (data.Contains("home_region_id")) - userData.HomeRegionID = new LLUUID((string)data["home_region_id"]); + userData.HomeRegionID = new UUID((string)data["home_region_id"]); else - userData.HomeRegionID = LLUUID.Zero; + userData.HomeRegionID = UUID.Zero; userData.HomeLocation = - new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), + new Vector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), (float) Convert.ToDecimal((string) data["home_coordinates_y"]), (float) Convert.ToDecimal((string) data["home_coordinates_z"])); userData.HomeLookAt = - new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), + new Vector3((float) Convert.ToDecimal((string) data["home_look_x"]), (float) Convert.ToDecimal((string) data["home_look_y"]), (float) Convert.ToDecimal((string) data["home_look_z"])); if (data.Contains("user_flags")) @@ -100,9 +100,9 @@ namespace OpenSim.Region.Communications.OGS1 userData.CustomType = ""; if (data.Contains("partner")) - userData.Partner = new LLUUID((string) data["partner"]); + userData.Partner = new UUID((string) data["partner"]); else - userData.Partner = LLUUID.Zero; + userData.Partner = UUID.Zero; return userData; } @@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// null if the request fails - public UserAgentData GetAgentByUUID(LLUUID userId) + public UserAgentData GetAgentByUUID(UUID userId) { try { @@ -131,11 +131,11 @@ namespace OpenSim.Region.Communications.OGS1 "): " + (string)respData["error_desc"]); return null; } - LLUUID sessionid = LLUUID.Zero; + UUID sessionid = UUID.Zero; UserAgentData userAgent = new UserAgentData(); userAgent.Handle = Convert.ToUInt64((string)respData["handle"]); - Helpers.TryParse((string)respData["sessionid"], out sessionid); + UUID.TryParse((string)respData["sessionid"], out sessionid); userAgent.SessionID = sessionid; if ((string)respData["agent_online"] == "TRUE") @@ -183,17 +183,17 @@ namespace OpenSim.Region.Communications.OGS1 } } - public List ConvertXMLRPCDataToAvatarPickerList(LLUUID queryID, Hashtable data) + public List ConvertXMLRPCDataToAvatarPickerList(UUID queryID, Hashtable data) { List pickerlist = new List(); int pickercount = Convert.ToInt32((string) data["avcount"]); - LLUUID respqueryID = new LLUUID((string) data["queryid"]); + UUID respqueryID = new UUID((string) data["queryid"]); if (queryID == respqueryID) { for (int i = 0; i < pickercount; i++) { AvatarPickerAvatar apicker = new AvatarPickerAvatar(); - LLUUID avatarID = new LLUUID((string) data["avatarid" + i.ToString()]); + UUID avatarID = new UUID((string) data["avatarid" + i.ToString()]); string firstname = (string) data["firstname" + i.ToString()]; string lastname = (string) data["lastname" + i.ToString()]; apicker.AvatarID = avatarID; @@ -219,8 +219,8 @@ namespace OpenSim.Region.Communications.OGS1 { FriendListItem buddylistitem = new FriendListItem(); - buddylistitem.FriendListOwner = new LLUUID((string)data["ownerID" + i.ToString()]); - buddylistitem.Friend = new LLUUID((string)data["friendID" + i.ToString()]); + buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]); + buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]); buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]); buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]); @@ -239,11 +239,11 @@ namespace OpenSim.Region.Communications.OGS1 /// final position x /// final position y /// final position z - public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) + public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz) { Hashtable param = new Hashtable(); - param["avatar_uuid"] = userid.UUID.ToString(); - param["region_uuid"] = regionid.UUID.ToString(); + param["avatar_uuid"] = userid.ToString(); + param["region_uuid"] = regionid.ToString(); param["region_handle"] = regionhandle.ToString(); param["region_pos_x"] = posx.ToString(); param["region_pos_y"] = posy.ToString(); @@ -268,7 +268,7 @@ namespace OpenSim.Region.Communications.OGS1 return GetUserProfile(firstName + " " + lastName); } - public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) + public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { Hashtable param = new Hashtable(); param.Add("avatar_id", avatarid.ToString()); @@ -320,7 +320,7 @@ namespace OpenSim.Region.Communications.OGS1 } } - public List GenerateAgentPickerRequestResponse(LLUUID queryID, string query) + public List GenerateAgentPickerRequestResponse(UUID queryID, string query) { List pickerlist = new List(); Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9 ]"); @@ -379,7 +379,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// null if the request fails - public UserProfileData GetUserProfile(LLUUID avatarID) + public UserProfileData GetUserProfile(UUID avatarID) { try { @@ -404,7 +404,7 @@ namespace OpenSim.Region.Communications.OGS1 } - public void ClearUserAgent(LLUUID avatarID) + public void ClearUserAgent(UUID avatarID) { // TODO: implement } @@ -435,7 +435,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public UserProfileData SetupMasterUser(LLUUID uuid) + public UserProfileData SetupMasterUser(UUID uuid) { UserProfileData data = GetUserProfile(uuid); @@ -448,7 +448,7 @@ namespace OpenSim.Region.Communications.OGS1 return data; } - public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) + public UUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) { throw new Exception("The method or operation is not implemented."); } @@ -523,13 +523,13 @@ namespace OpenSim.Region.Communications.OGS1 /// The agent that who's friends list is being added to /// The agent that being added to the friends list of the friends list owner /// A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects - public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) + public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { try { Hashtable param = new Hashtable(); - param["ownerID"] = friendlistowner.UUID.ToString(); - param["friendID"] = friend.UUID.ToString(); + param["ownerID"] = friendlistowner.ToString(); + param["friendID"] = friend.ToString(); param["friendPerms"] = perms.ToString(); IList parameters = new ArrayList(); parameters.Add(param); @@ -575,13 +575,13 @@ namespace OpenSim.Region.Communications.OGS1 /// /// The agent that who's friends list is being updated /// The Ex-friend agent - public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) + public void RemoveUserFriend(UUID friendlistowner, UUID friend) { try { Hashtable param = new Hashtable(); - param["ownerID"] = friendlistowner.UUID.ToString(); - param["friendID"] = friend.UUID.ToString(); + param["ownerID"] = friendlistowner.ToString(); + param["friendID"] = friend.ToString(); IList parameters = new ArrayList(); parameters.Add(param); @@ -627,13 +627,13 @@ namespace OpenSim.Region.Communications.OGS1 /// The agent that who's friends list is being updated /// The agent that is getting or loosing permissions /// A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects - public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) + public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) { try { Hashtable param = new Hashtable(); - param["ownerID"] = friendlistowner.UUID.ToString(); - param["friendID"] = friend.UUID.ToString(); + param["ownerID"] = friendlistowner.ToString(); + param["friendID"] = friend.ToString(); param["friendPerms"] = perms.ToString(); IList parameters = new ArrayList(); parameters.Add(param); @@ -672,17 +672,17 @@ namespace OpenSim.Region.Communications.OGS1 } } /// - /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner + /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner /// /// The agent that we're retreiving the friends Data. - public List GetUserFriendList(LLUUID friendlistowner) + public List GetUserFriendList(UUID friendlistowner) { List buddylist = new List(); try { Hashtable param = new Hashtable(); - param["ownerID"] = friendlistowner.UUID.ToString(); + param["ownerID"] = friendlistowner.ToString(); IList parameters = new ArrayList(); parameters.Add(param); @@ -708,7 +708,7 @@ namespace OpenSim.Region.Communications.OGS1 #endregion /// Appearance - public AvatarAppearance GetUserAppearance(LLUUID user) + public AvatarAppearance GetUserAppearance(UUID user) { AvatarAppearance appearance = null; @@ -733,7 +733,7 @@ namespace OpenSim.Region.Communications.OGS1 return appearance; } - public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) + public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) { try { -- cgit v1.1