aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Interfaces/IAttachmentsService.cs17
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs14
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs8
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//
7using System;
8using Nini.Config;
9
10namespace 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 ee06225..8cf846b 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -287,9 +287,13 @@ namespace OpenSim.Services.Interfaces
287 } 287 }
288 catch (SocketException e) 288 catch (SocketException e)
289 { 289 {
290 throw new Exception( 290 /*throw new Exception(
291 "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + 291 "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
292 e + "' attached to this exception", e); 292 e + "' attached to this exception", e);*/
293 // Don't throw a fatal exception here, instead, return Null and handle it in the caller.
294 // Reason is, on systems such as OSgrid it has occured that known hostnames stop
295 // resolving and thus make surrounding regions crash out with this exception.
296 return null;
293 } 297 }
294 298
295 return new IPEndPoint(ia, m_internalEndPoint.Port); 299 return new IPEndPoint(ia, m_internalEndPoint.Port);
@@ -347,6 +351,12 @@ namespace OpenSim.Services.Interfaces
347 if (kvp.ContainsKey("regionName")) 351 if (kvp.ContainsKey("regionName"))
348 RegionName = (string)kvp["regionName"]; 352 RegionName = (string)kvp["regionName"];
349 353
354 if (kvp.ContainsKey("access"))
355 {
356 byte access = Convert.ToByte((string)kvp["access"]);
357 Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
358 }
359
350 if (kvp.ContainsKey("serverIP")) 360 if (kvp.ContainsKey("serverIP"))
351 { 361 {
352 //int port = 0; 362 //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>