aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-25 06:33:14 +0000
committerTeravus Ovares2008-02-25 06:33:14 +0000
commitb831a91852b34473f993f9a3e88ddd4e0c8455ca (patch)
tree3c61bfa3800274fed804812b6145f2d5388626bb /OpenSim/Grid/UserServer
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-b831a91852b34473f993f9a3e88ddd4e0c8455ca.zip
opensim-SC_OLD-b831a91852b34473f993f9a3e88ddd4e0c8455ca.tar.gz
opensim-SC_OLD-b831a91852b34473f993f9a3e88ddd4e0c8455ca.tar.bz2
opensim-SC_OLD-b831a91852b34473f993f9a3e88ddd4e0c8455ca.tar.xz
* Message Server Linkages (still not ready for use so don't start it yet)
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs1
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs10
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs9
3 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 3500665..3a3b8b6 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -227,6 +227,7 @@ namespace OpenSim.Grid.UserServer
227 227
228 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position) 228 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position)
229 { 229 {
230
230 m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, Position); 231 m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, Position);
231 } 232 }
232 233
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 251644b..6535247 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.UserServer
119 119
120 if (requestData.Contains("uri")) 120 if (requestData.Contains("uri"))
121 { 121 {
122 string URI = (string)requestData["URI"]; 122 string URI = (string)requestData["uri"];
123 123
124 DeRegisterMessageServer(URI); 124 DeRegisterMessageServer(URI);
125 responseData["responsestring"] = "TRUE"; 125 responseData["responsestring"] = "TRUE";
@@ -153,6 +153,14 @@ namespace OpenSim.Grid.UserServer
153 public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position) 153 public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position)
154 { 154 {
155 // Loop over registered Message Servers ( AND THERE WILL BE MORE THEN ONE :D ) 155 // Loop over registered Message Servers ( AND THERE WILL BE MORE THEN ONE :D )
156 if (MessageServers.Count > 0)
157 {
158 m_log.Info("[MSGCONNECTOR]: Sending login notice to registered message servers");
159 }
160 else
161 {
162 m_log.Info("[MSGCONNECTOR]: No Message Servers registered, ignoring");
163 }
156 foreach (MessageServerInfo serv in MessageServers.Values) 164 foreach (MessageServerInfo serv in MessageServers.Values)
157 { 165 {
158 NotifyMessageServerAboutUser(serv, agentID, sessionID, RegionID, regionhandle, Position); 166 NotifyMessageServerAboutUser(serv, agentID, sessionID, RegionID, regionhandle, Position);
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 80899e8..a82b978 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -144,7 +144,13 @@ namespace OpenSim.Grid.UserServer
144 m_log.ErrorFormat( 144 m_log.ErrorFormat(
145 "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", 145 "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}",
146 SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString); 146 SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
147 } 147 }
148 handler001 = OnUserLoggedInAtLocation;
149 if (handler001 != null)
150 {
151 m_log.Info("[LOGIN]: Letting other objects know about login");
152 handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos);
153 }
148 } 154 }
149 catch (Exception) 155 catch (Exception)
150 { 156 {
@@ -219,6 +225,7 @@ namespace OpenSim.Grid.UserServer
219 handler001 = OnUserLoggedInAtLocation; 225 handler001 = OnUserLoggedInAtLocation;
220 if (handler001 != null) 226 if (handler001 != null)
221 { 227 {
228 m_log.Info("[LOGIN]: Letting other objects know about login");
222 handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos); 229 handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos);
223 } 230 }
224 } 231 }