aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-01 14:13:29 +0000
committerTeravus Ovares2008-06-01 14:13:29 +0000
commite0b821f8753c6d412f341fe109b8f83df14662a5 (patch)
tree516bcce6bd0b8347cb4d5f63512c22ee2a970f15 /OpenSim/Grid
parent* Committing more unfinished stuff. Nothing significant at the moment. IM ... (diff)
downloadopensim-SC-e0b821f8753c6d412f341fe109b8f83df14662a5.zip
opensim-SC-e0b821f8753c6d412f341fe109b8f83df14662a5.tar.gz
opensim-SC-e0b821f8753c6d412f341fe109b8f83df14662a5.tar.bz2
opensim-SC-e0b821f8753c6d412f341fe109b8f83df14662a5.tar.xz
* This enables grid-wide instant messaging in a peer to peer with tracker style way over XMLRPC.
* Friend status updates are still only local, so you still won't know before instant messaging someone if they're online. * The server each user is on and the user server must be updated or the instant message won't get to the destination.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 2695ff4..905bf81 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Grid.UserServer
133 m_httpServer.AddXmlRPCHandler("update_avatar_appearance", m_userManager.XmlRPCUpdateAvatarAppearance); 133 m_httpServer.AddXmlRPCHandler("update_avatar_appearance", m_userManager.XmlRPCUpdateAvatarAppearance);
134 m_httpServer.AddXmlRPCHandler("update_user_current_region", m_userManager.XmlRPCAtRegion); 134 m_httpServer.AddXmlRPCHandler("update_user_current_region", m_userManager.XmlRPCAtRegion);
135 m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID); 135 m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID);
136 136 m_httpServer.AddXmlRPCHandler("get_agent_by_uuid", m_userManager.XmlRPCGetAgentMethodUUID);
137 // Message Server ---> User Server 137 // Message Server ---> User Server
138 m_httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer); 138 m_httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer);
139 m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion); 139 m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion);
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 3e8f3a2..a78876c 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -466,7 +466,7 @@ namespace OpenSim.Grid.UserServer
466 return CreateUnknownUserErrorResponse(); 466 return CreateUnknownUserErrorResponse();
467 } 467 }
468 468
469 return ProfileToXmlRPCResponse(userProfile); 469 return response;
470 } 470 }
471 471
472 472