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. --- OpenSim/Grid/AssetServer/Main.cs | 6 +- OpenSim/Grid/AssetServer/RestService.cs | 10 +-- .../OGS1/OGS1InterServiceInventoryService.cs | 10 +-- OpenSim/Grid/GridServer/GridManager.cs | 46 ++++++------ .../Grid/InventoryServer/GridInventoryService.cs | 10 +-- OpenSim/Grid/InventoryServer/Main.cs | 4 +- OpenSim/Grid/MessagingServer/Main.cs | 8 +-- OpenSim/Grid/MessagingServer/MessageService.cs | 40 +++++------ .../MessagingServer/PresenceBackreferenceEntry.cs | 16 ++--- OpenSim/Grid/MessagingServer/UserManager.cs | 6 +- OpenSim/Grid/MessagingServer/UserPresenceData.cs | 4 +- OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 10 +-- OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 4 +- OpenSim/Grid/UserServer/Main.cs | 20 +++--- OpenSim/Grid/UserServer/MessageServersConnector.cs | 12 ++-- OpenSim/Grid/UserServer/UserLoginService.cs | 14 ++-- OpenSim/Grid/UserServer/UserManager.cs | 84 +++++++++++----------- 17 files changed, 152 insertions(+), 152 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 6d46048..bded875 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs @@ -28,7 +28,7 @@ using System; using System.IO; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using log4net.Config; using OpenSim.Framework; @@ -108,7 +108,7 @@ namespace OpenSim.Grid.AssetServer m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); } - public byte[] GetAssetData(LLUUID assetID, bool isTexture) + public byte[] GetAssetData(UUID assetID, bool isTexture) { return null; } @@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetServer new PluginLoader (new AssetDataInitialiser (connect)); // loader will try to load all providers (MySQL, MSSQL, etc) - // unless it is constrainted to the correct "Provider" entry in the addin.xml + // unless it is constrainted to the correct "Provider" entry in the addin.Xml loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); loader.Load(); diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index f63b78b..457142f 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -32,7 +32,7 @@ using System.Reflection; using System.Text; using System.Xml; using System.Xml.Serialization; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Servers; @@ -70,9 +70,9 @@ namespace OpenSim.Grid.AssetServer if (p.Length > 0) { - LLUUID assetID = null; + UUID assetID = null; - if (!LLUUID.TryParse(p[0], out assetID)) + if (!UUID.TryParse(p[0], out assetID)) { m_log.InfoFormat( "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); @@ -128,9 +128,9 @@ namespace OpenSim.Grid.AssetServer { string param = GetParam(path); - LLUUID assetId; + UUID assetId; if (param.Length > 0) - LLUUID.TryParse(param, out assetId); + UUID.TryParse(param, out assetId); // byte[] txBuffer = new byte[4096]; XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); diff --git a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs index a36d396..5de5bb3 100644 --- a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs +++ b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Servers; @@ -51,10 +51,10 @@ namespace OpenSim.Grid.Communications.OGS1 /// /// /// - public bool CreateNewUserInventory(LLUUID userId) + public bool CreateNewUserInventory(UUID userId) { return SynchronousRestObjectPoster.BeginPostObject( - "POST", m_inventoryServerUrl + "CreateInventory/", userId.UUID); + "POST", m_inventoryServerUrl + "CreateInventory/", userId.Guid); } /// @@ -62,10 +62,10 @@ namespace OpenSim.Grid.Communications.OGS1 /// /// /// - public List GetInventorySkeleton(LLUUID userId) + public List GetInventorySkeleton(UUID userId) { return SynchronousRestObjectPoster.BeginPostObject>( - "POST", m_inventoryServerUrl + "RootFolders/", userId.UUID); + "POST", m_inventoryServerUrl + "RootFolders/", userId.Guid); } } } diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index eb4aea6..6fbfc71 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; using System.IO; using System.Reflection; using System.Xml; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; using OpenSim.Data; @@ -68,7 +68,7 @@ namespace OpenSim.Grid.GridServer new PluginLoader (new LogDataInitialiser (connect)); // loader will try to load all providers (MySQL, MSSQL, etc) - // unless it is constrainted to the correct "Provider" entry in the addin.xml + // unless it is constrainted to the correct "Provider" entry in the addin.Xml gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); @@ -107,13 +107,13 @@ namespace OpenSim.Grid.GridServer /// /// A UUID key of the region to return /// A SimProfileData for the region - public RegionProfileData GetRegion(LLUUID uuid) + public RegionProfileData GetRegion(UUID uuid) { foreach (IGridDataPlugin plugin in _plugins) { try { - return plugin.GetProfileByLLUUID(uuid); + return plugin.GetProfileByUUID(uuid); } catch (Exception e) { @@ -340,9 +340,9 @@ namespace OpenSim.Grid.GridServer RegionProfileData existingSim; Hashtable requestData = (Hashtable)request.Params[0]; - LLUUID uuid; + UUID uuid; - if (!requestData.ContainsKey("UUID") || !LLUUID.TryParse((string)requestData["UUID"], out uuid)) + if (!requestData.ContainsKey("UUID") || !UUID.TryParse((string)requestData["UUID"], out uuid)) { m_log.Warn("[LOGIN PRELUDE]: Region connected without a UUID, sending back error response."); return ErrorResponse("No UUID passed to grid server - unable to connect you"); @@ -425,7 +425,7 @@ namespace OpenSim.Grid.GridServer catch (Exception e) { m_log.Warn("[LOGIN END]: " + - "Unable to login region " + sim.UUID.ToString() + " via " + plugin.Name); + "Unable to login region " + sim.ToString() + " via " + plugin.Name); m_log.Warn("[LOGIN END]: " + e.ToString()); } } @@ -471,7 +471,7 @@ namespace OpenSim.Grid.GridServer responseData["user_recvkey"] = sim.regionUserRecvKey; responseData["authkey"] = sim.regionSecret; - // New! If set, use as URL to local sim storage (ie http://remotehost/region.yap) + // New! If set, use as URL to local sim storage (ie http://remotehost/region.Yap) responseData["data_uri"] = sim.regionDataURI; responseData["allow_forceful_banlines"] = Config.AllowForcefulBanlines; @@ -515,7 +515,7 @@ namespace OpenSim.Grid.GridServer NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString(); NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString(); NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString(); - NeighbourBlock["UUID"] = aSim.Value.UUID.ToString(); + NeighbourBlock["UUID"] = aSim.Value.ToString(); NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString(); if (aSim.Value.UUID != sim.UUID) @@ -566,8 +566,8 @@ namespace OpenSim.Grid.GridServer RegionProfileData sim; sim = new RegionProfileData(); - sim.UUID = new LLUUID((string)requestData["UUID"]); - sim.originUUID = new LLUUID((string)requestData["originUUID"]); + sim.UUID = new UUID((string)requestData["UUID"]); + sim.originUUID = new UUID((string)requestData["originUUID"]); sim.regionRecvKey = String.Empty; sim.regionSendKey = String.Empty; @@ -602,8 +602,8 @@ namespace OpenSim.Grid.GridServer sim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]); sim.regionLocZ = 0; - LLUUID textureID; - if (LLUUID.TryParse((string)requestData["map-image-id"], out textureID)) + UUID textureID; + if (UUID.TryParse((string)requestData["map-image-id"], out textureID)) { sim.regionMapTextureID = textureID; } @@ -654,11 +654,11 @@ namespace OpenSim.Grid.GridServer if (requestData.ContainsKey("UUID")) { - //TheSim = GetRegion(new LLUUID((string) requestData["UUID"])); + //TheSim = GetRegion(new UUID((string) requestData["UUID"])); uuid = requestData["UUID"].ToString(); m_log.InfoFormat("[LOGOUT]: Logging out region: {0}", uuid); - // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcDeleteRegionMethod","", 5,"Attempting delete with UUID."); + // logToDB((new UUID((string)requestData["UUID"])).ToString(),"XmlRpcDeleteRegionMethod","", 5,"Attempting delete with UUID."); } else { @@ -716,7 +716,7 @@ namespace OpenSim.Grid.GridServer RegionProfileData simData = null; if (requestData.ContainsKey("region_UUID")) { - LLUUID regionID = new LLUUID((string)requestData["region_UUID"]); + UUID regionID = new UUID((string)requestData["region_UUID"]); simData = GetRegion(regionID); if (simData == null) { @@ -764,7 +764,7 @@ namespace OpenSim.Grid.GridServer responseData["remoting_port"] = simData.remotingPort.ToString(); responseData["region_locx"] = simData.regionLocX.ToString(); responseData["region_locy"] = simData.regionLocY.ToString(); - responseData["region_UUID"] = simData.UUID.UUID.ToString(); + responseData["region_UUID"] = simData.UUID.Guid.ToString(); responseData["region_name"] = simData.regionName; responseData["regionHandle"] = simData.regionHandle.ToString(); } @@ -923,8 +923,8 @@ namespace OpenSim.Grid.GridServer RegionProfileData TheSim; - LLUUID UUID; - if (LLUUID.TryParse(param, out UUID)) + UUID UUID; + if (UUID.TryParse(param, out UUID)) { TheSim = GetRegion(UUID); @@ -933,7 +933,7 @@ namespace OpenSim.Grid.GridServer respstring = ""; respstring += "" + TheSim.regionSendKey + ""; respstring += ""; - respstring += "" + TheSim.UUID.ToString() + ""; + respstring += "" + TheSim.ToString() + ""; respstring += "" + TheSim.regionName + ""; respstring += "" + Util.GetHostFromDNS(TheSim.serverIP).ToString() + ""; respstring += "" + TheSim.serverPort.ToString() + ""; @@ -969,11 +969,11 @@ namespace OpenSim.Grid.GridServer { Console.WriteLine("Processing region update via REST method"); RegionProfileData theSim; - theSim = GetRegion(new LLUUID(param)); + theSim = GetRegion(new UUID(param)); if (theSim == null) { theSim = new RegionProfileData(); - LLUUID UUID = new LLUUID(param); + UUID UUID = new UUID(param); theSim.UUID = UUID; theSim.regionRecvKey = Config.SimRecvKey; } @@ -1067,7 +1067,7 @@ namespace OpenSim.Grid.GridServer { plugin.AddProfile(theSim); m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")"); - logToDB(theSim.UUID.ToString(), "RestSetSimMethod", String.Empty, 5, + logToDB(theSim.ToString(), "RestSetSimMethod", String.Empty, 5, "Region successfully updated and connected to grid."); } else diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index e4d43d4..4d58775 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs @@ -32,7 +32,7 @@ using System.Reflection; using System.Threading; using System.Net; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; @@ -147,7 +147,7 @@ namespace OpenSim.Grid.InventoryServer } } - public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) + public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback) { } @@ -158,7 +158,7 @@ namespace OpenSim.Grid.InventoryServer /// The user's inventory. If an inventory cannot be found then an empty collection is returned. public InventoryCollection GetUserInventory(Guid rawUserID) { - LLUUID userID = new LLUUID(rawUserID); + UUID userID = new UUID(rawUserID); m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); @@ -216,7 +216,7 @@ namespace OpenSim.Grid.InventoryServer /// public List GetInventorySkeleton(Guid rawUserID) { - LLUUID userID = new LLUUID(rawUserID); + UUID userID = new UUID(rawUserID); return GetInventorySkeleton(userID); } @@ -227,7 +227,7 @@ namespace OpenSim.Grid.InventoryServer /// public bool CreateUsersInventory(Guid rawUserID) { - LLUUID userID = new LLUUID(rawUserID); + UUID userID = new UUID(rawUserID); m_log.InfoFormat("[GRID AGENT INVENTORY]: Creating new set of inventory folders for user {0}", userID); diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index a77c570..9f40d16 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using log4net.Config; using OpenSim.Framework; @@ -142,7 +142,7 @@ namespace OpenSim.Grid.InventoryServer switch (cmd) { case "add-user": - m_inventoryService.CreateUsersInventory(LLUUID.Random().UUID); + m_inventoryService.CreateUsersInventory(UUID.Random().Guid); break; } } diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index c80d48c..f9be780 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs @@ -28,7 +28,7 @@ using System; using System.IO; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using log4net.Config; @@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer private MessageServerConfig Cfg; private MessageService msgsvc; - // private LLUUID m_lastCreatedUser = LLUUID.Random(); + // private UUID m_lastCreatedUser = UUID.Random(); public static void Main(string[] args) { @@ -84,7 +84,7 @@ namespace OpenSim.Grid.MessagingServer { base.Startup(); - Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); + Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.Xml"))); m_log.Info("[REGION]: Starting HTTP process"); m_httpServer = new BaseHttpServer(Cfg.HttpPort); @@ -133,7 +133,7 @@ namespace OpenSim.Grid.MessagingServer try { //RestObjectPoster.BeginPostObject(m_userManager._config.InventoryUrl + "CreateInventory/", - //userID.UUID); + //userID.Guid); } catch (Exception ex) { diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index dd6e445..1c5d334 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Net; using System.Reflection; using System.Threading; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; using OpenSim.Data; @@ -206,11 +206,11 @@ namespace OpenSim.Grid.MessagingServer /// /// /// - public void addBackReference(LLUUID agentID, LLUUID friendID) + public void addBackReference(UUID agentID, UUID friendID) { if (m_presence_BackReferences.Contains(friendID)) { - List presenseBackReferences = (List)m_presence_BackReferences[friendID]; + List presenseBackReferences = (List)m_presence_BackReferences[friendID]; if (!presenseBackReferences.Contains(agentID)) { presenseBackReferences.Add(agentID); @@ -219,7 +219,7 @@ namespace OpenSim.Grid.MessagingServer } else { - List presenceBackReferences = new List(); + List presenceBackReferences = new List(); presenceBackReferences.Add(agentID); m_presence_BackReferences[friendID] = presenceBackReferences; } @@ -230,11 +230,11 @@ namespace OpenSim.Grid.MessagingServer /// /// /// - public void removeBackReference(LLUUID agentID, LLUUID friendID) + public void removeBackReference(UUID agentID, UUID friendID) { if (m_presence_BackReferences.Contains(friendID)) { - List presenseBackReferences = (List)m_presence_BackReferences[friendID]; + List presenseBackReferences = (List)m_presence_BackReferences[friendID]; if (presenseBackReferences.Contains(agentID)) { presenseBackReferences.Remove(agentID); @@ -253,11 +253,11 @@ namespace OpenSim.Grid.MessagingServer /// Logoff Processor. Call this to clean up agent presence data and send logoff presence notifications /// /// - private void ProcessLogOff(LLUUID AgentID) + private void ProcessLogOff(UUID AgentID) { m_log.Info("[LOGOFF]: Processing Logoff"); UserPresenceData AgentData = null; - List AgentsNeedingNotification = new List(); + List AgentsNeedingNotification = new List(); UserPresenceData friendd = null; lock (m_presences) { @@ -275,7 +275,7 @@ namespace OpenSim.Grid.MessagingServer //{ //if (m_presence_BackReferences.Contains(AgentID)) //{ - //AgentsNeedingNotification = (List)m_presence_BackReferences[AgentID]; + //AgentsNeedingNotification = (List)m_presence_BackReferences[AgentID]; //} //} @@ -356,17 +356,17 @@ namespace OpenSim.Grid.MessagingServer #region UserServer Comms /// - /// 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); @@ -403,8 +403,8 @@ namespace OpenSim.Grid.MessagingServer { 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()]); @@ -438,11 +438,11 @@ namespace OpenSim.Grid.MessagingServer //requestData["lastname"] = lastname; AgentCircuitData agentData = new AgentCircuitData(); - agentData.SessionID = new LLUUID((string)requestData["sessionid"]); - agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]); + agentData.SessionID = new UUID((string)requestData["sessionid"]); + 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["agentid"]); + agentData.AgentID = new UUID((string)requestData["agentid"]); agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); agentData.CapsPath = (string)requestData["caps_path"]; @@ -453,7 +453,7 @@ namespace OpenSim.Grid.MessagingServer else { agentData.startpos = - new LLVector3(Convert.ToUInt32(requestData["positionx"]), + new Vector3(Convert.ToUInt32(requestData["positionx"]), Convert.ToUInt32(requestData["positiony"]), Convert.ToUInt32(requestData["positionz"])); agentData.child = false; @@ -485,7 +485,7 @@ namespace OpenSim.Grid.MessagingServer m_log.Info("[USERLOGOFF]: User logged off called"); Hashtable requestData = (Hashtable)request.Params[0]; - LLUUID AgentID = new LLUUID((string)requestData["agentid"]); + UUID AgentID = new UUID((string)requestData["agentid"]); ProcessLogOff(AgentID); @@ -598,7 +598,7 @@ namespace OpenSim.Grid.MessagingServer regionProfile.regionLocY = regY; regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); - regionProfile.UUID = new LLUUID((string)responseData["region_UUID"]); + regionProfile.UUID = new UUID((string)responseData["region_UUID"]); regionProfile.regionName = (string)responseData["region_name"]; lock (m_regionInfoCache) { diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs index 281beb9..4d6f3de 100644 --- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs +++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs @@ -28,21 +28,21 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Grid.MessagingServer { - // This is a wrapper for a List so it can be happily stored in a hashtable. + // This is a wrapper for a List so it can be happily stored in a hashtable. public class PresenceBackreferenceEntry { - List AgentList = new List(); + List AgentList = new List(); public PresenceBackreferenceEntry() { } - public void Add(LLUUID item) + public void Add(UUID item) { lock (AgentList) { @@ -50,9 +50,9 @@ namespace OpenSim.Grid.MessagingServer } } - public LLUUID getitem(int index) + public UUID getitem(int index) { - LLUUID result = null; + UUID result = null; lock (AgentList) { if (index > 0 && index < AgentList.Count) @@ -76,7 +76,7 @@ namespace OpenSim.Grid.MessagingServer } } - public void Remove(LLUUID item) + public void Remove(UUID item) { lock (AgentList) { @@ -85,7 +85,7 @@ namespace OpenSim.Grid.MessagingServer } } - public bool contains(LLUUID item) + public bool contains(UUID item) { bool result = false; lock (AgentList) diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs index de41756..6fa5113 100644 --- a/OpenSim/Grid/MessagingServer/UserManager.cs +++ b/OpenSim/Grid/MessagingServer/UserManager.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 Nwc.XmlRpc; using OpenSim.Framework; @@ -41,7 +41,7 @@ namespace OpenSim.Grid.MessagingServer { class UserManager : UserManagerBase { - public UserAgentData GetUserAgentData(LLUUID AgentID) + public UserAgentData GetUserAgentData(UUID AgentID) { UserProfileData userProfile = GetUserProfile(AgentID); @@ -67,7 +67,7 @@ namespace OpenSim.Grid.MessagingServer return null; } - public override UserProfileData SetupMasterUser(LLUUID uuid) + public override UserProfileData SetupMasterUser(UUID uuid) { //throw new Exception("The method or operation is not implemented."); return null; diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs index 3c5002c..2119c13 100644 --- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs +++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; @@ -39,7 +39,7 @@ namespace OpenSim.Grid.MessagingServer public RegionProfileData regionData = new RegionProfileData(); public string httpURI = String.Empty; public List friendData = new List (); - public List subscriptionData = new List(); + public List subscriptionData = new List(); public bool OnlineYN = true; public bool lookupUserRegionYN = true; diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index 13bf290..3b433ba 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs @@ -29,7 +29,7 @@ using System; using System.IO; using System.Net; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework.Servers; @@ -63,9 +63,9 @@ namespace OpenSim.Grid.MessagingServer if (p.Length > 0) { - LLUUID assetID = null; + UUID assetID = null; - if (!LLUUID.TryParse(p[0], out assetID)) + if (!UUID.TryParse(p[0], out assetID)) { m_log.InfoFormat( "[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]); @@ -91,9 +91,9 @@ namespace OpenSim.Grid.MessagingServer { string param = GetParam(path); - LLUUID assetId; + UUID assetId; if (param.Length > 0) - LLUUID.TryParse(param, out assetId); + UUID.TryParse(param, out assetId); // byte[] txBuffer = new byte[4096]; // TODO: Read POST serialize XMPP stanzas diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs index 63bdea8..4b226ae 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs @@ -27,7 +27,7 @@ using System; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; @@ -92,7 +92,7 @@ namespace OpenSim.Grid.ScriptServer if (Command == "OnRezScript") { - Engine.EventManager().OnRezScript((uint)p[0], new LLUUID((string)p[1]), (string)p[2], 0, false); + Engine.EventManager().OnRezScript((uint)p[0], new UUID((string)p[1]), (string)p[2], 0, false); } } diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index e487648..6441b7a 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.IO; using System.Net; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using log4net.Config; using OpenSim.Framework; @@ -58,7 +58,7 @@ namespace OpenSim.Grid.UserServer public MessageServersConnector m_messagesService; protected IInterServiceInventoryServices m_interServiceInventoryService; - private LLUUID m_lastCreatedUser = LLUUID.Random(); + private UUID m_lastCreatedUser = UUID.Random(); public static void Main(string[] args) { @@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer { base.Startup(); - Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); + Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.Xml"))); m_stats = StatsManager.StartCollectingUserStats(); @@ -183,7 +183,7 @@ namespace OpenSim.Grid.UserServer tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); - LLUUID userID = new LLUUID(); + UUID userID = new UUID(); try { @@ -209,7 +209,7 @@ namespace OpenSim.Grid.UserServer { m_log.ErrorFormat( "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", - Cfg.InventoryUrl + "CreateInventory/", userID.UUID); + Cfg.InventoryUrl + "CreateInventory/", userID); } catch (Exception e) { @@ -240,8 +240,8 @@ namespace OpenSim.Grid.UserServer case "test-inventory": // RestObjectPosterResponse> requester = new RestObjectPosterResponse>(); // requester.ReturnResponseVal = TestResponse; - // requester.BeginPostObject(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); - SynchronousRestObjectPoster.BeginPostObject>( + // requester.BeginPostObject(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); + SynchronousRestObjectPoster.BeginPostObject>( "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); break; @@ -322,12 +322,12 @@ namespace OpenSim.Grid.UserServer m_console.Notice("response got"); } - public void NotifyMessageServersUserLoggOff(LLUUID agentID) + public void NotifyMessageServersUserLoggOff(UUID agentID) { m_messagesService.TellMessageServersAboutUserLogoff(agentID); } - public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, + public void NotifyMessageServersUserLoggedInToLocation(UUID agentID, UUID sessionID, UUID RegionID, ulong regionhandle, float positionX, float positionY, float positionZ, string firstname, string lastname) { @@ -335,4 +335,4 @@ namespace OpenSim.Grid.UserServer positionY, positionZ, firstname, lastname); } } -} \ No newline at end of file +} diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index b3f8b19..8fecd5b 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs @@ -29,7 +29,7 @@ using System.Collections; using System.Collections.Generic; using System.Net; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; using OpenSim.Framework.Servers; @@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer // string scurrentRegionID = (string)requestData["regionid"]; // string sregionhandle = (string)requestData["regionhandle"]; // string scurrentpos = (string)requestData["currentpos"]; - //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); + //Vector3.TryParse((string)reader["currentPos"], out retval.currentPos); // TODO: Okay now raise event so the user server can pass this data to the Usermanager responseData["responsestring"] = "TRUE"; @@ -155,7 +155,7 @@ namespace OpenSim.Grid.UserServer return response; } - public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, + public void TellMessageServersAboutUser(UUID agentID, UUID sessionID, UUID RegionID, ulong regionhandle, float positionX, float positionY, float positionZ, string firstname, string lastname) { @@ -179,7 +179,7 @@ namespace OpenSim.Grid.UserServer } } - public void TellMessageServersAboutUserLogoff(LLUUID agentID) + public void TellMessageServersAboutUserLogoff(UUID agentID) { lock (MessageServers) { @@ -198,7 +198,7 @@ namespace OpenSim.Grid.UserServer } } - private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, LLUUID agentID) + private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, UUID agentID) { Hashtable reqparams = new Hashtable(); reqparams["sendkey"] = serv.sendkey; @@ -219,7 +219,7 @@ namespace OpenSim.Grid.UserServer } private void NotifyMessageServerAboutUser(MessageServerInfo serv, - LLUUID agentID, LLUUID sessionID, LLUUID RegionID, + UUID agentID, UUID sessionID, UUID RegionID, ulong regionhandle, float positionX, float positionY, float positionZ, string firstname, string lastname) { diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 1f84346..10490a6 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -29,7 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; using OpenSim.Data; @@ -39,7 +39,7 @@ using OpenSim.Framework.Communications.Cache; namespace OpenSim.Grid.UserServer { - public delegate void UserLoggedInAtLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, + public delegate void UserLoggedInAtLocation(UUID agentID, UUID sessionID, UUID RegionID, ulong regionhandle, float positionX, float positionY, float positionZ, string firstname, string lastname); @@ -151,7 +151,7 @@ namespace OpenSim.Grid.UserServer int start_z = -1; // use the homeRegionID if it is stored already. If not, use the regionHandle as before - if (theUser.HomeRegionID != LLUUID.Zero) + if (theUser.HomeRegionID != UUID.Zero) { HomeInfo = RegionProfileData.RequestSimProfileData( @@ -271,7 +271,7 @@ namespace OpenSim.Grid.UserServer theUser.CurrentAgent.Handle = SimInfo.regionHandle; if (start_x >= 0 && start_y >= 0 && start_z >= 0) { - LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z); + Vector3 tmp_v = new Vector3(start_x, start_y, start_z); theUser.CurrentAgent.Position = tmp_v; } // Prepare notification @@ -466,7 +466,7 @@ namespace OpenSim.Grid.UserServer } // See LoginService - protected override InventoryData GetInventorySkeleton(LLUUID userID) + protected override InventoryData GetInventorySkeleton(UUID userID) { m_log.DebugFormat( "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", @@ -498,7 +498,7 @@ namespace OpenSim.Grid.UserServer if (folders != null && folders.Count > 0) { - LLUUID rootID = LLUUID.Zero; + UUID rootID = UUID.Zero; ArrayList AgentInventoryArray = new ArrayList(); Hashtable TempHash; @@ -506,7 +506,7 @@ namespace OpenSim.Grid.UserServer { // m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name); - if (InvFolder.ParentID == LLUUID.Zero) + if (InvFolder.ParentID == UUID.Zero) { rootID = InvFolder.ID; } diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 69c550a..4b5f5a0 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs @@ -29,7 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using Nwc.XmlRpc; using OpenSim.Framework; @@ -38,7 +38,7 @@ using OpenSim.Framework.Servers; namespace OpenSim.Grid.UserServer { - public delegate void logOffUser(LLUUID AgentID); + public delegate void logOffUser(UUID AgentID); public class UserManager : UserManagerBase { @@ -79,7 +79,7 @@ namespace OpenSim.Grid.UserServer return response; } - public XmlRpcResponse AvatarPickerListtoXmlRPCResponse(LLUUID queryID, List returnUsers) + public XmlRpcResponse AvatarPickerListtoXmlRPCResponse(UUID queryID, List returnUsers) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable responseData = new Hashtable(); @@ -108,8 +108,8 @@ namespace OpenSim.Grid.UserServer for (int i = 0; i < returnUsers.Count; i++) { - responseData["ownerID" + i] = returnUsers[i].FriendListOwner.UUID.ToString(); - responseData["friendID" + i] = returnUsers[i].Friend.UUID.ToString(); + responseData["ownerID" + i] = returnUsers[i].FriendListOwner.ToString(); + responseData["friendID" + i] = returnUsers[i].Friend.ToString(); responseData["ownerPerms" + i] = returnUsers[i].FriendListOwnerPerms.ToString(); responseData["friendPerms" + i] = returnUsers[i].FriendPerms.ToString(); } @@ -172,11 +172,11 @@ namespace OpenSim.Grid.UserServer // XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable) request.Params[0]; List returnAvatar = new List(); - LLUUID queryID = new LLUUID(LLUUID.Zero.ToString()); + UUID queryID = new UUID(UUID.Zero.ToString()); if (requestData.Contains("avquery") && requestData.Contains("queryid")) { - queryID = new LLUUID((string) requestData["queryid"]); + queryID = new UUID((string) requestData["queryid"]); returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]); } @@ -195,13 +195,13 @@ namespace OpenSim.Grid.UserServer requestData.Contains("region_uuid")) { // ulong cregionhandle = 0; - LLUUID regionUUID; - LLUUID avatarUUID; + UUID regionUUID; + UUID avatarUUID; - Helpers.TryParse((string) requestData["avatar_id"], out avatarUUID); - Helpers.TryParse((string) requestData["region_uuid"], out regionUUID); + UUID.TryParse((string) requestData["avatar_id"], out avatarUUID); + UUID.TryParse((string) requestData["region_uuid"], out regionUUID); - if (avatarUUID != LLUUID.Zero) + if (avatarUUID != UUID.Zero) { UserProfileData userProfile = GetUserProfile(avatarUUID); userProfile.CurrentAgent.Region = regionUUID; @@ -231,8 +231,8 @@ namespace OpenSim.Grid.UserServer requestData.Contains("friendPerms")) { // UserManagerBase.AddNewuserFriend - AddNewUserFriend(new LLUUID((string) requestData["ownerID"]), - new LLUUID((string) requestData["friendID"]), + AddNewUserFriend(new UUID((string) requestData["ownerID"]), + new UUID((string) requestData["friendID"]), (uint) Convert.ToInt32((string) requestData["friendPerms"])); returnString = "TRUE"; } @@ -252,8 +252,8 @@ namespace OpenSim.Grid.UserServer if (requestData.Contains("ownerID") && requestData.Contains("friendID")) { // UserManagerBase.AddNewuserFriend - RemoveUserFriend(new LLUUID((string) requestData["ownerID"]), - new LLUUID((string) requestData["friendID"])); + RemoveUserFriend(new UUID((string) requestData["ownerID"]), + new UUID((string) requestData["friendID"])); returnString = "TRUE"; } responseData["returnString"] = returnString; @@ -271,8 +271,8 @@ namespace OpenSim.Grid.UserServer if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms")) { - UpdateUserFriendPerms(new LLUUID((string) requestData["ownerID"]), - new LLUUID((string) requestData["friendID"]), + UpdateUserFriendPerms(new UUID((string) requestData["ownerID"]), + new UUID((string) requestData["friendID"]), (uint) Convert.ToInt32((string) requestData["friendPerms"])); // UserManagerBase. returnString = "TRUE"; @@ -292,7 +292,7 @@ namespace OpenSim.Grid.UserServer if (requestData.Contains("ownerID")) { - returndata = GetUserFriendList(new LLUUID((string) requestData["ownerID"])); + returndata = GetUserFriendList(new UUID((string) requestData["ownerID"])); } return FriendListItemListtoXmlRPCResponse(returndata); @@ -306,7 +306,7 @@ namespace OpenSim.Grid.UserServer Hashtable responseData; if (requestData.Contains("owner")) { - appearance = GetUserAppearance(new LLUUID((string) requestData["owner"])); + appearance = GetUserAppearance(new UUID((string) requestData["owner"])); if (appearance == null) { responseData = new Hashtable(); @@ -337,7 +337,7 @@ namespace OpenSim.Grid.UserServer if (requestData.Contains("owner")) { AvatarAppearance appearance = new AvatarAppearance(requestData); - UpdateUserAppearance(new LLUUID((string) requestData["owner"]), appearance); + UpdateUserAppearance(new UUID((string) requestData["owner"]), appearance); responseData = new Hashtable(); responseData["returnString"] = "TRUE"; } @@ -396,7 +396,7 @@ namespace OpenSim.Grid.UserServer { try { - LLUUID guess = new LLUUID((string) requestData["avatar_uuid"]); + UUID guess = new UUID((string) requestData["avatar_uuid"]); userProfile = GetUserProfile(guess); } @@ -427,11 +427,11 @@ namespace OpenSim.Grid.UserServer //CFK: Console.WriteLine("METHOD BY UUID CALLED"); if (requestData.Contains("avatar_uuid")) { - LLUUID guess; + UUID guess; - Helpers.TryParse((string) requestData["avatar_uuid"], out guess); + UUID.TryParse((string) requestData["avatar_uuid"], out guess); - if (guess == LLUUID.Zero) + if (guess == UUID.Zero) { return CreateUnknownUserErrorResponse(); } @@ -476,16 +476,16 @@ namespace OpenSim.Grid.UserServer string authed = "FALSE"; if (requestData.Contains("avatar_uuid") && requestData.Contains("session_id")) { - LLUUID guess_aid; - LLUUID guess_sid; + UUID guess_aid; + UUID guess_sid; - Helpers.TryParse((string) requestData["avatar_uuid"], out guess_aid); - if (guess_aid == LLUUID.Zero) + UUID.TryParse((string) requestData["avatar_uuid"], out guess_aid); + if (guess_aid == UUID.Zero) { return CreateUnknownUserErrorResponse(); } - Helpers.TryParse((string) requestData["session_id"], out guess_sid); - if (guess_sid == LLUUID.Zero) + UUID.TryParse((string) requestData["session_id"], out guess_sid); + if (guess_sid == UUID.Zero) { return CreateUnknownUserErrorResponse(); } @@ -520,7 +520,7 @@ namespace OpenSim.Grid.UserServer return CreateUnknownUserErrorResponse(); } - LLUUID UserUUID = new LLUUID((string) requestData["avatar_uuid"]); + UUID UserUUID = new UUID((string) requestData["avatar_uuid"]); UserProfileData userProfile = GetUserProfile(UserUUID); if (null == userProfile) { @@ -532,11 +532,11 @@ namespace OpenSim.Grid.UserServer } if (requestData.Contains("FLImageID")) { - userProfile.FirstLifeImage = new LLUUID((string) requestData["FLImageID"]); + userProfile.FirstLifeImage = new UUID((string) requestData["FLImageID"]); } if (requestData.Contains("ImageID")) { - userProfile.Image = new LLUUID((string) requestData["ImageID"]); + userProfile.Image = new UUID((string) requestData["ImageID"]); } // dont' know how yet if (requestData.Contains("MaturePublish")) @@ -575,8 +575,8 @@ namespace OpenSim.Grid.UserServer } if (requestData.Contains("home_region_id")) { - LLUUID regionID; - LLUUID.TryParse((string) requestData["home_region_id"], out regionID); + UUID regionID; + UUID.TryParse((string) requestData["home_region_id"], out regionID); userProfile.HomeRegionID = regionID; } if (requestData.Contains("home_pos_x")) @@ -682,7 +682,7 @@ namespace OpenSim.Grid.UserServer { try { - userProfile.Partner = new LLUUID((string) requestData["partner"]); + userProfile.Partner = new UUID((string) requestData["partner"]); } catch (InvalidCastException) { @@ -691,7 +691,7 @@ namespace OpenSim.Grid.UserServer } else { - userProfile.Partner = LLUUID.Zero; + userProfile.Partner = UUID.Zero; } // call plugin! @@ -710,8 +710,8 @@ namespace OpenSim.Grid.UserServer { try { - LLUUID userUUID = new LLUUID((string) requestData["avatar_uuid"]); - LLUUID RegionID = new LLUUID((string) requestData["region_uuid"]); + UUID userUUID = new UUID((string) requestData["avatar_uuid"]); + UUID RegionID = new UUID((string) requestData["region_uuid"]); ulong regionhandle = (ulong) Convert.ToInt64((string) requestData["region_handle"]); float posx = (float) Convert.ToDecimal((string) requestData["region_pos_x"]); float posy = (float) Convert.ToDecimal((string) requestData["region_pos_y"]); @@ -749,9 +749,9 @@ namespace OpenSim.Grid.UserServer throw new Exception("The method or operation is not implemented."); } - public override UserProfileData SetupMasterUser(LLUUID uuid) + public override UserProfileData SetupMasterUser(UUID uuid) { throw new Exception("The method or operation is not implemented."); } } -} \ No newline at end of file +} -- cgit v1.1