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/UserServer/MessageServersConnector.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Grid/UserServer/MessageServersConnector.cs') 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) { -- cgit v1.1