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/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 +++--- 6 files changed, 42 insertions(+), 42 deletions(-) (limited to 'OpenSim/Grid/MessagingServer') 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 -- cgit v1.1