* Message Server Linkages (still not ready for use so don't start it yet)

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
 
         public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position)
         {
+            
             m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, Position);
         }
 
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
 
             if (requestData.Contains("uri"))
             {
-                string URI = (string)requestData["URI"];
+                string URI = (string)requestData["uri"];
 
                 DeRegisterMessageServer(URI);
                 responseData["responsestring"] = "TRUE";
@@ -153,6 +153,14 @@ namespace OpenSim.Grid.UserServer
         public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position)
         {
             // Loop over registered Message Servers ( AND THERE WILL BE MORE THEN ONE :D )
+            if (MessageServers.Count > 0)
+            {
+                m_log.Info("[MSGCONNECTOR]: Sending login notice to registered message servers");
+            }
+            else
+            {
+                m_log.Info("[MSGCONNECTOR]: No Message Servers registered, ignoring");
+            }
             foreach (MessageServerInfo serv in MessageServers.Values)
             {
                 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
                     m_log.ErrorFormat(
                         "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", 
                         SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
-                }                
+                }
+                handler001 = OnUserLoggedInAtLocation;
+                if (handler001 != null)
+                {
+                    m_log.Info("[LOGIN]: Letting other objects know about login");
+                    handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos);
+                }
             }
             catch (Exception)
             {
@@ -219,6 +225,7 @@ namespace OpenSim.Grid.UserServer
                     handler001 = OnUserLoggedInAtLocation;
                     if (handler001 != null)
                     {
+                        m_log.Info("[LOGIN]: Letting other objects know about login");
                         handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos);
                     }
                 }