diff options
Diffstat (limited to 'OpenSim/Grid/UserServer/MessageServersConnector.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/MessageServersConnector.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index 4e9728e..529c089 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs | |||
@@ -41,12 +41,12 @@ namespace OpenSim.Grid.UserServer | |||
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | public Dictionary<string, MessageServerInfo> MessageServers; | 43 | public Dictionary<string, MessageServerInfo> MessageServers; |
44 | 44 | ||
45 | public MessageServersConnector() | 45 | public MessageServersConnector() |
46 | { | 46 | { |
47 | MessageServers = new Dictionary<string, MessageServerInfo>(); | 47 | MessageServers = new Dictionary<string, MessageServerInfo>(); |
48 | } | 48 | } |
49 | 49 | ||
50 | public void RegisterMessageServer(string URI, MessageServerInfo serverData) | 50 | public void RegisterMessageServer(string URI, MessageServerInfo serverData) |
51 | { | 51 | { |
52 | lock (MessageServers) | 52 | lock (MessageServers) |
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.UserServer | |||
55 | MessageServers.Add(URI, serverData); | 55 | MessageServers.Add(URI, serverData); |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | public void DeRegisterMessageServer(string URI) | 59 | public void DeRegisterMessageServer(string URI) |
60 | { | 60 | { |
61 | lock (MessageServers) | 61 | lock (MessageServers) |
@@ -64,7 +64,7 @@ namespace OpenSim.Grid.UserServer | |||
64 | MessageServers.Remove(URI); | 64 | MessageServers.Remove(URI); |
65 | } | 65 | } |
66 | } | 66 | } |
67 | 67 | ||
68 | public void AddResponsibleRegion(string URI, ulong regionhandle) | 68 | public void AddResponsibleRegion(string URI, ulong regionhandle) |
69 | { | 69 | { |
70 | if (!MessageServers.ContainsKey(URI)) | 70 | if (!MessageServers.ContainsKey(URI)) |
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.UserServer | |||
76 | MessageServerInfo msginfo = MessageServers["URI"]; | 76 | MessageServerInfo msginfo = MessageServers["URI"]; |
77 | msginfo.responsibleForRegions.Add(regionhandle); | 77 | msginfo.responsibleForRegions.Add(regionhandle); |
78 | MessageServers["URI"] = msginfo; | 78 | MessageServers["URI"] = msginfo; |
79 | } | 79 | } |
80 | } | 80 | } |
81 | public void RemoveResponsibleRegion(string URI, ulong regionhandle) | 81 | public void RemoveResponsibleRegion(string URI, ulong regionhandle) |
82 | { | 82 | { |
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer | |||
92 | msginfo.responsibleForRegions.Remove(regionhandle); | 92 | msginfo.responsibleForRegions.Remove(regionhandle); |
93 | MessageServers["URI"] = msginfo; | 93 | MessageServers["URI"] = msginfo; |
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | } | 97 | } |
98 | public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) | 98 | public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) |
@@ -148,7 +148,7 @@ namespace OpenSim.Grid.UserServer | |||
148 | string scurrentpos = (string)requestData["currentpos"]; | 148 | string scurrentpos = (string)requestData["currentpos"]; |
149 | //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); | 149 | //LLVector3.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"; |
153 | response.Value = responseData; | 153 | response.Value = responseData; |
154 | } | 154 | } |
@@ -156,7 +156,7 @@ namespace OpenSim.Grid.UserServer | |||
156 | } | 156 | } |
157 | 157 | ||
158 | public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, | 158 | public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID 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 | { |
162 | // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D) | 162 | // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D) |
@@ -218,9 +218,9 @@ namespace OpenSim.Grid.UserServer | |||
218 | m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout"); | 218 | m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout"); |
219 | } | 219 | } |
220 | 220 | ||
221 | private void NotifyMessageServerAboutUser(MessageServerInfo serv, | 221 | private void NotifyMessageServerAboutUser(MessageServerInfo serv, |
222 | LLUUID agentID, LLUUID sessionID, LLUUID RegionID, | 222 | LLUUID agentID, LLUUID sessionID, LLUUID 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 | { |
226 | Hashtable reqparams = new Hashtable(); | 226 | Hashtable reqparams = new Hashtable(); |
@@ -250,7 +250,7 @@ namespace OpenSim.Grid.UserServer | |||
250 | { | 250 | { |
251 | m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user"); | 251 | m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user"); |
252 | } | 252 | } |
253 | 253 | ||
254 | } | 254 | } |
255 | } | 255 | } |
256 | } | 256 | } |