diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Interfaces/IAttachmentsService.cs | 17 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 14 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/ISimulationService.cs | 8 |
3 files changed, 37 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IAttachmentsService.cs b/OpenSim/Services/Interfaces/IAttachmentsService.cs new file mode 100644 index 0000000..bdde369 --- /dev/null +++ b/OpenSim/Services/Interfaces/IAttachmentsService.cs | |||
@@ -0,0 +1,17 @@ | |||
1 | //////////////////////////////////////////////////////////////// | ||
2 | // | ||
3 | // (c) 2009, 2010 Careminster Limited and Melanie Thielker | ||
4 | // | ||
5 | // All rights reserved | ||
6 | // | ||
7 | using System; | ||
8 | using Nini.Config; | ||
9 | |||
10 | namespace OpenSim.Services.Interfaces | ||
11 | { | ||
12 | public interface IAttachmentsService | ||
13 | { | ||
14 | string Get(string id); | ||
15 | void Store(string id, string data); | ||
16 | } | ||
17 | } | ||
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 77230a3..cce8f2c 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -260,9 +260,13 @@ namespace OpenSim.Services.Interfaces | |||
260 | } | 260 | } |
261 | catch (SocketException e) | 261 | catch (SocketException e) |
262 | { | 262 | { |
263 | throw new Exception( | 263 | /*throw new Exception( |
264 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + | 264 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + |
265 | e + "' attached to this exception", e); | 265 | e + "' attached to this exception", e);*/ |
266 | // Don't throw a fatal exception here, instead, return Null and handle it in the caller. | ||
267 | // Reason is, on systems such as OSgrid it has occured that known hostnames stop | ||
268 | // resolving and thus make surrounding regions crash out with this exception. | ||
269 | return null; | ||
266 | } | 270 | } |
267 | 271 | ||
268 | return new IPEndPoint(ia, m_internalEndPoint.Port); | 272 | return new IPEndPoint(ia, m_internalEndPoint.Port); |
@@ -320,6 +324,12 @@ namespace OpenSim.Services.Interfaces | |||
320 | if (kvp.ContainsKey("regionName")) | 324 | if (kvp.ContainsKey("regionName")) |
321 | RegionName = (string)kvp["regionName"]; | 325 | RegionName = (string)kvp["regionName"]; |
322 | 326 | ||
327 | if (kvp.ContainsKey("access")) | ||
328 | { | ||
329 | byte access = Convert.ToByte((string)kvp["access"]); | ||
330 | Maturity = (int)Util.ConvertAccessLevelToMaturity(access); | ||
331 | } | ||
332 | |||
323 | if (kvp.ContainsKey("serverIP")) | 333 | if (kvp.ContainsKey("serverIP")) |
324 | { | 334 | { |
325 | //int port = 0; | 335 | //int port = 0; |
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index 67d7cbe..33d6fde 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
@@ -71,6 +71,14 @@ namespace OpenSim.Services.Interfaces | |||
71 | bool ReleaseAgent(UUID originRegion, UUID id, string uri); | 71 | bool ReleaseAgent(UUID originRegion, UUID id, string uri); |
72 | 72 | ||
73 | /// <summary> | 73 | /// <summary> |
74 | /// Close child agent. | ||
75 | /// </summary> | ||
76 | /// <param name="regionHandle"></param> | ||
77 | /// <param name="id"></param> | ||
78 | /// <returns></returns> | ||
79 | bool CloseChildAgent(GridRegion destination, UUID id); | ||
80 | |||
81 | /// <summary> | ||
74 | /// Close agent. | 82 | /// Close agent. |
75 | /// </summary> | 83 | /// </summary> |
76 | /// <param name="regionHandle"></param> | 84 | /// <param name="regionHandle"></param> |