diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Grid/UserServer/MessageServersConnector.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/MessageServersConnector.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
35 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer | |||
146 | // string scurrentRegionID = (string)requestData["regionid"]; | 146 | // string scurrentRegionID = (string)requestData["regionid"]; |
147 | // string sregionhandle = (string)requestData["regionhandle"]; | 147 | // string sregionhandle = (string)requestData["regionhandle"]; |
148 | // string scurrentpos = (string)requestData["currentpos"]; | 148 | // string scurrentpos = (string)requestData["currentpos"]; |
149 | //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); | 149 | //Vector3.TryParse((string)reader["currentPos"], out retval.currentPos); |
150 | // TODO: Okay now raise event so the user server can pass this data to the Usermanager | 150 | // TODO: Okay now raise event so the user server can pass this data to the Usermanager |
151 | 151 | ||
152 | responseData["responsestring"] = "TRUE"; | 152 | responseData["responsestring"] = "TRUE"; |
@@ -155,7 +155,7 @@ namespace OpenSim.Grid.UserServer | |||
155 | return response; | 155 | return response; |
156 | } | 156 | } |
157 | 157 | ||
158 | public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, | 158 | public void TellMessageServersAboutUser(UUID agentID, UUID sessionID, UUID RegionID, |
159 | ulong regionhandle, float positionX, float positionY, | 159 | ulong regionhandle, float positionX, float positionY, |
160 | float positionZ, string firstname, string lastname) | 160 | float positionZ, string firstname, string lastname) |
161 | { | 161 | { |
@@ -179,7 +179,7 @@ namespace OpenSim.Grid.UserServer | |||
179 | } | 179 | } |
180 | } | 180 | } |
181 | 181 | ||
182 | public void TellMessageServersAboutUserLogoff(LLUUID agentID) | 182 | public void TellMessageServersAboutUserLogoff(UUID agentID) |
183 | { | 183 | { |
184 | lock (MessageServers) | 184 | lock (MessageServers) |
185 | { | 185 | { |
@@ -198,7 +198,7 @@ namespace OpenSim.Grid.UserServer | |||
198 | } | 198 | } |
199 | } | 199 | } |
200 | 200 | ||
201 | private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, LLUUID agentID) | 201 | private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, UUID agentID) |
202 | { | 202 | { |
203 | Hashtable reqparams = new Hashtable(); | 203 | Hashtable reqparams = new Hashtable(); |
204 | reqparams["sendkey"] = serv.sendkey; | 204 | reqparams["sendkey"] = serv.sendkey; |
@@ -219,7 +219,7 @@ namespace OpenSim.Grid.UserServer | |||
219 | } | 219 | } |
220 | 220 | ||
221 | private void NotifyMessageServerAboutUser(MessageServerInfo serv, | 221 | private void NotifyMessageServerAboutUser(MessageServerInfo serv, |
222 | LLUUID agentID, LLUUID sessionID, LLUUID RegionID, | 222 | UUID agentID, UUID sessionID, UUID RegionID, |
223 | ulong regionhandle, float positionX, float positionY, float positionZ, | 223 | ulong regionhandle, float positionX, float positionY, float positionZ, |
224 | string firstname, string lastname) | 224 | string firstname, string lastname) |
225 | { | 225 | { |