aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IAttachmentsService.cs17
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs14
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs8
-rw-r--r--OpenSim/Services/Interfaces/IUserAccountService.cs5
4 files changed, 42 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 7137f9a..2b0b947 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -321,9 +321,13 @@ namespace OpenSim.Services.Interfaces
321 } 321 }
322 catch (SocketException e) 322 catch (SocketException e)
323 { 323 {
324 throw new Exception( 324 /*throw new Exception(
325 "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + 325 "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
326 e + "' attached to this exception", e); 326 e + "' attached to this exception", e);*/
327 // Don't throw a fatal exception here, instead, return Null and handle it in the caller.
328 // Reason is, on systems such as OSgrid it has occured that known hostnames stop
329 // resolving and thus make surrounding regions crash out with this exception.
330 return null;
327 } 331 }
328 332
329 return new IPEndPoint(ia, m_internalEndPoint.Port); 333 return new IPEndPoint(ia, m_internalEndPoint.Port);
@@ -381,6 +385,12 @@ namespace OpenSim.Services.Interfaces
381 if (kvp.ContainsKey("regionName")) 385 if (kvp.ContainsKey("regionName"))
382 RegionName = (string)kvp["regionName"]; 386 RegionName = (string)kvp["regionName"];
383 387
388 if (kvp.ContainsKey("access"))
389 {
390 byte access = Convert.ToByte((string)kvp["access"]);
391 Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
392 }
393
384 if (kvp.ContainsKey("serverIP")) 394 if (kvp.ContainsKey("serverIP"))
385 { 395 {
386 //int port = 0; 396 //int port = 0;
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 5f9ce6d..ae6bd72 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -80,6 +80,14 @@ namespace OpenSim.Services.Interfaces
80 bool ReleaseAgent(UUID originRegion, UUID id, string uri); 80 bool ReleaseAgent(UUID originRegion, UUID id, string uri);
81 81
82 /// <summary> 82 /// <summary>
83 /// Close child agent.
84 /// </summary>
85 /// <param name="regionHandle"></param>
86 /// <param name="id"></param>
87 /// <returns></returns>
88 bool CloseChildAgent(GridRegion destination, UUID id);
89
90 /// <summary>
83 /// Close agent. 91 /// Close agent.
84 /// </summary> 92 /// </summary>
85 /// <param name="regionHandle"></param> 93 /// <param name="regionHandle"></param>
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 6cc8eb8..d0fddee 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -91,6 +91,7 @@ namespace OpenSim.Services.Interfaces
91 public int UserLevel; 91 public int UserLevel;
92 public int UserFlags; 92 public int UserFlags;
93 public string UserTitle; 93 public string UserTitle;
94 public string UserCountry;
94 95
95 public Dictionary<string, object> ServiceURLs; 96 public Dictionary<string, object> ServiceURLs;
96 97
@@ -119,6 +120,8 @@ namespace OpenSim.Services.Interfaces
119 UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString()); 120 UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString());
120 if (kvp.ContainsKey("UserTitle")) 121 if (kvp.ContainsKey("UserTitle"))
121 UserTitle = kvp["UserTitle"].ToString(); 122 UserTitle = kvp["UserTitle"].ToString();
123 if (kvp.ContainsKey("UserCountry"))
124 UserCountry = kvp["UserCountry"].ToString();
122 125
123 if (kvp.ContainsKey("Created")) 126 if (kvp.ContainsKey("Created"))
124 Created = Convert.ToInt32(kvp["Created"].ToString()); 127 Created = Convert.ToInt32(kvp["Created"].ToString());
@@ -152,6 +155,7 @@ namespace OpenSim.Services.Interfaces
152 result["UserLevel"] = UserLevel.ToString(); 155 result["UserLevel"] = UserLevel.ToString();
153 result["UserFlags"] = UserFlags.ToString(); 156 result["UserFlags"] = UserFlags.ToString();
154 result["UserTitle"] = UserTitle; 157 result["UserTitle"] = UserTitle;
158 result["UserCountry"] = UserCountry;
155 159
156 string str = string.Empty; 160 string str = string.Empty;
157 foreach (KeyValuePair<string, object> kvp in ServiceURLs) 161 foreach (KeyValuePair<string, object> kvp in ServiceURLs)
@@ -178,6 +182,7 @@ namespace OpenSim.Services.Interfaces
178 /// <param name="query"></param> 182 /// <param name="query"></param>
179 /// <returns></returns> 183 /// <returns></returns>
180 List<UserAccount> GetUserAccounts(UUID scopeID, string query); 184 List<UserAccount> GetUserAccounts(UUID scopeID, string query);
185 List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where);
181 186
182 /// <summary> 187 /// <summary>
183 /// Store the data given, wich replaces the stored data, therefore must be complete. 188 /// Store the data given, wich replaces the stored data, therefore must be complete.