diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 63c6e5f..66e5870 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Services.Interfaces | |||
85 | GridRegion GetRegionByName(UUID scopeID, string regionName); | 85 | GridRegion GetRegionByName(UUID scopeID, string regionName); |
86 | 86 | ||
87 | /// <summary> | 87 | /// <summary> |
88 | /// Get information about regions starting with the provided name. | 88 | /// Get information about regions starting with the provided name. |
89 | /// </summary> | 89 | /// </summary> |
90 | /// <param name="name"> | 90 | /// <param name="name"> |
91 | /// The name to match against. | 91 | /// The name to match against. |
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Interfaces | |||
95 | /// </param> | 95 | /// </param> |
96 | /// <returns> | 96 | /// <returns> |
97 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the | 97 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the |
98 | /// grid-server couldn't be contacted or returned an error, return null. | 98 | /// grid-server couldn't be contacted or returned an error, return null. |
99 | /// </returns> | 99 | /// </returns> |
100 | List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber); | 100 | List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber); |
101 | 101 | ||
@@ -139,7 +139,7 @@ namespace OpenSim.Services.Interfaces | |||
139 | #pragma warning restore 414 | 139 | #pragma warning restore 414 |
140 | 140 | ||
141 | /// <summary> | 141 | /// <summary> |
142 | /// The port by which http communication occurs with the region | 142 | /// The port by which http communication occurs with the region |
143 | /// </summary> | 143 | /// </summary> |
144 | public uint HttpPort { get; set; } | 144 | public uint HttpPort { get; set; } |
145 | 145 | ||
@@ -148,7 +148,7 @@ namespace OpenSim.Services.Interfaces | |||
148 | /// </summary> | 148 | /// </summary> |
149 | public string ServerURI | 149 | public string ServerURI |
150 | { | 150 | { |
151 | get { | 151 | get { |
152 | if (!String.IsNullOrEmpty(m_serverURI)) { | 152 | if (!String.IsNullOrEmpty(m_serverURI)) { |
153 | return m_serverURI; | 153 | return m_serverURI; |
154 | } else { | 154 | } else { |
@@ -158,7 +158,7 @@ namespace OpenSim.Services.Interfaces | |||
158 | return "http://" + m_externalHostName + ":" + HttpPort + "/"; | 158 | return "http://" + m_externalHostName + ":" + HttpPort + "/"; |
159 | } | 159 | } |
160 | } | 160 | } |
161 | set { | 161 | set { |
162 | if ( value == null) | 162 | if ( value == null) |
163 | { | 163 | { |
164 | m_serverURI = String.Empty; | 164 | m_serverURI = String.Empty; |
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Interfaces | |||
344 | RegionSecret = ConvertFrom.RegionSecret; | 344 | RegionSecret = ConvertFrom.RegionSecret; |
345 | EstateOwner = ConvertFrom.EstateOwner; | 345 | EstateOwner = ConvertFrom.EstateOwner; |
346 | } | 346 | } |
347 | 347 | ||
348 | public GridRegion(Dictionary<string, object> kvp) | 348 | public GridRegion(Dictionary<string, object> kvp) |
349 | { | 349 | { |
350 | if (kvp.ContainsKey("uuid")) | 350 | if (kvp.ContainsKey("uuid")) |
@@ -424,7 +424,7 @@ namespace OpenSim.Services.Interfaces | |||
424 | // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", | 424 | // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", |
425 | // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); | 425 | // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); |
426 | } | 426 | } |
427 | 427 | ||
428 | public Dictionary<string, object> ToKeyValuePairs() | 428 | public Dictionary<string, object> ToKeyValuePairs() |
429 | { | 429 | { |
430 | Dictionary<string, object> kvp = new Dictionary<string, object>(); | 430 | Dictionary<string, object> kvp = new Dictionary<string, object>(); |