diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs index c86c67f..5de623c 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.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 libsecondlife; | 28 | using libsecondlife; |
30 | using System; | 29 | using System; |
@@ -65,35 +64,35 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
65 | region_external_hostname = regInfo.ExternalHostName; | 64 | region_external_hostname = regInfo.ExternalHostName; |
66 | 65 | ||
67 | if (!String.IsNullOrEmpty(regInfo.MasterAvatarFirstName)) | 66 | if (!String.IsNullOrEmpty(regInfo.MasterAvatarFirstName)) |
68 | region_owner = String.Format("{0} {1}", regInfo.MasterAvatarFirstName, | 67 | region_owner = String.Format("{0} {1}", regInfo.MasterAvatarFirstName, |
69 | regInfo.MasterAvatarLastName); | 68 | regInfo.MasterAvatarLastName); |
70 | } | 69 | } |
71 | 70 | ||
72 | public string this[string idx] | 71 | public string this[string idx] |
73 | { | 72 | { |
74 | get | 73 | get |
75 | { | 74 | { |
76 | switch(idx.ToLower()) | 75 | switch(idx.ToLower()) |
77 | { | 76 | { |
78 | case "name": | 77 | case "name": |
79 | return region_name; | 78 | return region_name; |
80 | case "id": | 79 | case "id": |
81 | return region_id; | 80 | return region_id; |
82 | case "location": | 81 | case "location": |
83 | return String.Format("<x>{0}</x><y>{1}</y>", region_x, region_y); | 82 | return String.Format("<x>{0}</x><y>{1}</y>", region_x, region_y); |
84 | case "owner": | 83 | case "owner": |
85 | return region_owner; | 84 | return region_owner; |
86 | case "owner_id": | 85 | case "owner_id": |
87 | return region_owner_id; | 86 | return region_owner_id; |
88 | case "http_port": | 87 | case "http_port": |
89 | return region_http_port.ToString(); | 88 | return region_http_port.ToString(); |
90 | case "server_uri": | 89 | case "server_uri": |
91 | return region_server_uri; | 90 | return region_server_uri; |
92 | case "external_hostname": | 91 | case "external_hostname": |
93 | case "hostname": | 92 | case "hostname": |
94 | return region_external_hostname; | 93 | return region_external_hostname; |
95 | 94 | ||
96 | default: | 95 | default: |
97 | return null; | 96 | return null; |
98 | } | 97 | } |
99 | } | 98 | } |