diff options
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Regions')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs | 8 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs | 9 |
2 files changed, 1 insertions, 16 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs index 5798286..734b668 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs | |||
@@ -113,14 +113,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
113 | rxw.WriteString(s.RegionInfo.ExternalHostName); | 113 | rxw.WriteString(s.RegionInfo.ExternalHostName); |
114 | rxw.WriteEndAttribute(); | 114 | rxw.WriteEndAttribute(); |
115 | 115 | ||
116 | rxw.WriteStartAttribute(String.Empty, "master_name", String.Empty); | ||
117 | rxw.WriteString(String.Format("{0} {1}", s.RegionInfo.MasterAvatarFirstName, s.RegionInfo.MasterAvatarLastName)); | ||
118 | rxw.WriteEndAttribute(); | ||
119 | |||
120 | rxw.WriteStartAttribute(String.Empty, "master_uuid", String.Empty); | ||
121 | rxw.WriteString(s.RegionInfo.MasterAvatarAssignedUUID.ToString()); | ||
122 | rxw.WriteEndAttribute(); | ||
123 | |||
124 | rxw.WriteStartAttribute(String.Empty, "ip", String.Empty); | 116 | rxw.WriteStartAttribute(String.Empty, "ip", String.Empty); |
125 | rxw.WriteString(s.RegionInfo.InternalEndPoint.ToString()); | 117 | rxw.WriteString(s.RegionInfo.InternalEndPoint.ToString()); |
126 | rxw.WriteEndAttribute(); | 118 | rxw.WriteEndAttribute(); |
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs index 746d08d..5e76009 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs | |||
@@ -56,20 +56,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
56 | region_id = regInfo.RegionID.ToString(); | 56 | region_id = regInfo.RegionID.ToString(); |
57 | region_x = regInfo.RegionLocX; | 57 | region_x = regInfo.RegionLocX; |
58 | region_y = regInfo.RegionLocY; | 58 | region_y = regInfo.RegionLocY; |
59 | if (regInfo.EstateSettings.EstateOwner != UUID.Zero) | 59 | region_owner_id = regInfo.EstateSettings.EstateOwner.ToString(); |
60 | region_owner_id = regInfo.EstateSettings.EstateOwner.ToString(); | ||
61 | else | ||
62 | region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString(); | ||
63 | region_http_port = regInfo.HttpPort; | 60 | region_http_port = regInfo.HttpPort; |
64 | region_server_uri = regInfo.ServerURI; | 61 | region_server_uri = regInfo.ServerURI; |
65 | region_external_hostname = regInfo.ExternalHostName; | 62 | region_external_hostname = regInfo.ExternalHostName; |
66 | 63 | ||
67 | Uri uri = new Uri(region_server_uri); | 64 | Uri uri = new Uri(region_server_uri); |
68 | region_port = (uint)uri.Port; | 65 | region_port = (uint)uri.Port; |
69 | |||
70 | if (!String.IsNullOrEmpty(regInfo.MasterAvatarFirstName)) | ||
71 | region_owner = String.Format("{0} {1}", regInfo.MasterAvatarFirstName, | ||
72 | regInfo.MasterAvatarLastName); | ||
73 | } | 66 | } |
74 | 67 | ||
75 | public string this[string idx] | 68 | public string this[string idx] |