aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-02-12 10:21:21 +0000
committerlbsa712009-02-12 10:21:21 +0000
commit61878884569f9c01b6324f9a9d9fbcac7034f536 (patch)
tree1871310b7bb4d4463feb5f456123305101090096
parent* Turned RegionProfileService non-static (diff)
downloadopensim-SC_OLD-61878884569f9c01b6324f9a9d9fbcac7034f536.zip
opensim-SC_OLD-61878884569f9c01b6324f9a9d9fbcac7034f536.tar.gz
opensim-SC_OLD-61878884569f9c01b6324f9a9d9fbcac7034f536.tar.bz2
opensim-SC_OLD-61878884569f9c01b6324f9a9d9fbcac7034f536.tar.xz
* Renamed RegionProfileService to RegionProfileServiceProxy to better reflect actual use.
* Added IRegionProfileService
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/IRegionProfileService.cs44
-rw-r--r--OpenSim/Data/RegionProfileServiceProxy.cs (renamed from OpenSim/Data/RegionProfileService.cs)2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs4
4 files changed, 48 insertions, 4 deletions
diff --git a/OpenSim/Data/IRegionProfileService.cs b/OpenSim/Data/IRegionProfileService.cs
new file mode 100644
index 0000000..5aa5b58
--- /dev/null
+++ b/OpenSim/Data/IRegionProfileService.cs
@@ -0,0 +1,44 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenMetaverse;
5
6namespace OpenSim.Data
7{
8 public interface IRegionProfileService
9 {
10 /// <summary>
11 /// Request sim profile information from a grid server, by Region UUID
12 /// </summary>
13 /// <param name="regionId">The region UUID to look for</param>
14 /// <param name="gridserverUrl"></param>
15 /// <param name="gridserverSendkey"></param>
16 /// <param name="gridserverRecvkey"></param>
17 /// <returns>The sim profile. Null if there was a request failure</returns>
18 /// <remarks>This method should be statics</remarks>
19 RegionProfileData RequestSimProfileData(UUID regionId, Uri gridserverUrl,
20 string gridserverSendkey, string gridserverRecvkey);
21
22 /// <summary>
23 /// Request sim profile information from a grid server, by Region Handle
24 /// </summary>
25 /// <param name="region_handle">the region handle to look for</param>
26 /// <param name="gridserver_url"></param>
27 /// <param name="gridserver_sendkey"></param>
28 /// <param name="gridserver_recvkey"></param>
29 /// <returns>The sim profile. Null if there was a request failure</returns>
30 RegionProfileData RequestSimProfileData(ulong region_handle, Uri gridserver_url,
31 string gridserver_sendkey, string gridserver_recvkey);
32
33 /// <summary>
34 /// Request sim profile information from a grid server, by Region Name
35 /// </summary>
36 /// <param name="regionName">the region name to look for</param>
37 /// <param name="gridserverUrl"></param>
38 /// <param name="gridserverSendkey"></param>
39 /// <param name="gridserverRecvkey"></param>
40 /// <returns>The sim profile. Null if there was a request failure</returns>
41 RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl,
42 string gridserverSendkey, string gridserverRecvkey);
43 }
44}
diff --git a/OpenSim/Data/RegionProfileService.cs b/OpenSim/Data/RegionProfileServiceProxy.cs
index 0cd4021..54e392a 100644
--- a/OpenSim/Data/RegionProfileService.cs
+++ b/OpenSim/Data/RegionProfileServiceProxy.cs
@@ -8,7 +8,7 @@ using OpenSim.Framework;
8 8
9namespace OpenSim.Data 9namespace OpenSim.Data
10{ 10{
11 public class RegionProfileService 11 public class RegionProfileServiceProxy : IRegionProfileService
12 { 12 {
13 /// <summary> 13 /// <summary>
14 /// Request sim data based on arbitrary key/value 14 /// Request sim data based on arbitrary key/value
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 70aaea3..2199e93 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Grid.UserServer
168 protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService) 168 protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService)
169 { 169 {
170 m_loginService = new UserLoginService( 170 m_loginService = new UserLoginService(
171 m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileService()); 171 m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy());
172 } 172 }
173 173
174 protected virtual void AddHttpHandlers() 174 protected virtual void AddHttpHandlers()
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index b11714a..d069e1a 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -59,12 +59,12 @@ namespace OpenSim.Grid.UserServer
59 private UserLoggedInAtLocation handlerUserLoggedInAtLocation; 59 private UserLoggedInAtLocation handlerUserLoggedInAtLocation;
60 60
61 public UserConfig m_config; 61 public UserConfig m_config;
62 private readonly RegionProfileService m_regionProfileService; 62 private readonly IRegionProfileService m_regionProfileService;
63 63
64 public UserLoginService( 64 public UserLoginService(
65 UserManagerBase userManager, IInterServiceInventoryServices inventoryService, 65 UserManagerBase userManager, IInterServiceInventoryServices inventoryService,
66 LibraryRootFolder libraryRootFolder, 66 LibraryRootFolder libraryRootFolder,
67 UserConfig config, string welcomeMess, RegionProfileService regionProfileService) 67 UserConfig config, string welcomeMess, IRegionProfileService regionProfileService)
68 : base(userManager, libraryRootFolder, welcomeMess) 68 : base(userManager, libraryRootFolder, welcomeMess)
69 { 69 {
70 m_config = config; 70 m_config = config;