diff options
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index ace47d8..e9ff91a 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -1,30 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | */ |
27 | */ | ||
28 | 27 | ||
29 | using System; | 28 | using System; |
30 | using System.Collections; | 29 | using System.Collections; |
@@ -188,7 +187,6 @@ namespace OpenSim.Grid.GridServer | |||
188 | return regions; | 187 | return regions; |
189 | } | 188 | } |
190 | 189 | ||
191 | |||
192 | /// <summary> | 190 | /// <summary> |
193 | /// Returns a XML String containing a list of the neighbouring regions | 191 | /// Returns a XML String containing a list of the neighbouring regions |
194 | /// </summary> | 192 | /// </summary> |
@@ -750,7 +748,6 @@ namespace OpenSim.Grid.GridServer | |||
750 | return response; | 748 | return response; |
751 | } | 749 | } |
752 | 750 | ||
753 | |||
754 | /// <summary> | 751 | /// <summary> |
755 | /// Performs a REST Get Operation | 752 | /// Performs a REST Get Operation |
756 | /// </summary> | 753 | /// </summary> |
@@ -867,7 +864,6 @@ namespace OpenSim.Grid.GridServer | |||
867 | TheSim.regionUserSendKey = Config.UserSendKey; | 864 | TheSim.regionUserSendKey = Config.UserSendKey; |
868 | TheSim.regionUserRecvKey = Config.UserRecvKey; | 865 | TheSim.regionUserRecvKey = Config.UserRecvKey; |
869 | 866 | ||
870 | |||
871 | for (int i = 0; i < simnode.ChildNodes.Count; i++) | 867 | for (int i = 0; i < simnode.ChildNodes.Count; i++) |
872 | { | 868 | { |
873 | switch (simnode.ChildNodes[i].Name) | 869 | switch (simnode.ChildNodes[i].Name) |
@@ -913,7 +909,6 @@ namespace OpenSim.Grid.GridServer | |||
913 | return "ERROR! 0.*.*.* / 255.*.*.* Addresses are invalid, please check your server config and try again"; | 909 | return "ERROR! 0.*.*.* / 255.*.*.* Addresses are invalid, please check your server config and try again"; |
914 | } | 910 | } |
915 | 911 | ||
916 | |||
917 | try | 912 | try |
918 | { | 913 | { |
919 | m_log.Info("[DATA]: " + | 914 | m_log.Info("[DATA]: " + |
@@ -954,6 +949,7 @@ namespace OpenSim.Grid.GridServer | |||
954 | return "ERROR! Could not save to database! (" + e.ToString() + ")"; | 949 | return "ERROR! Could not save to database! (" + e.ToString() + ")"; |
955 | } | 950 | } |
956 | } | 951 | } |
952 | |||
957 | public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) | 953 | public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) |
958 | { | 954 | { |
959 | XmlRpcResponse response = new XmlRpcResponse(); | 955 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -976,6 +972,7 @@ namespace OpenSim.Grid.GridServer | |||
976 | } | 972 | } |
977 | return response; | 973 | return response; |
978 | } | 974 | } |
975 | |||
979 | public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) | 976 | public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) |
980 | { | 977 | { |
981 | XmlRpcResponse response = new XmlRpcResponse(); | 978 | XmlRpcResponse response = new XmlRpcResponse(); |