diff options
author | Melanie | 2009-12-05 19:53:54 +0000 |
---|---|---|
committer | Melanie | 2009-12-05 19:53:54 +0000 |
commit | 43a6fa1d01707fda74b8ba7c2d9fb95210463b6a (patch) | |
tree | 77c5897901544e82467b1cdfafdc63644ee821ef /OpenSim/Grid | |
parent | Merge branch 'master' into careminster (diff) | |
parent | * Fix line endings in BaseHttpServer.cs (diff) | |
download | opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.zip opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.gz opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.bz2 opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs index f24cef6..3384952 100644 --- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs | |||
@@ -201,6 +201,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
201 | } | 201 | } |
202 | return response; | 202 | return response; |
203 | } | 203 | } |
204 | |||
204 | public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request, IPEndPoint remoteClient) | 205 | public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request, IPEndPoint remoteClient) |
205 | { | 206 | { |
206 | XmlRpcResponse response = new XmlRpcResponse(); | 207 | XmlRpcResponse response = new XmlRpcResponse(); |