aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-03-05 21:36:45 -0800
committerDiva Canto2010-03-05 21:36:45 -0800
commit5171464ac199f958a9a8a11664958260a88e863d (patch)
tree97f70afe241e8761d496d5f54acb5e5eae8d7495 /OpenSim/Services
parentrefactor: Move DetachSingleAttachmentToInv to region module (diff)
downloadopensim-SC_OLD-5171464ac199f958a9a8a11664958260a88e863d.zip
opensim-SC_OLD-5171464ac199f958a9a8a11664958260a88e863d.tar.gz
opensim-SC_OLD-5171464ac199f958a9a8a11664958260a88e863d.tar.bz2
opensim-SC_OLD-5171464ac199f958a9a8a11664958260a88e863d.tar.xz
Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs (renamed from OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs)4
-rw-r--r--OpenSim/Services/Interfaces/IGridUserService.cs (renamed from OpenSim/Services/Interfaces/IUserGridService.cs)12
-rw-r--r--OpenSim/Services/UserAccountService/GridUserService.cs (renamed from OpenSim/Services/UserAccountService/UserGridService.cs)16
-rw-r--r--OpenSim/Services/UserAccountService/GridUserServiceBase.cs (renamed from OpenSim/Services/UserAccountService/UserGridServiceBase.cs)14
4 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
index 3aa8940..ce88236 100644
--- a/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
@@ -29,9 +29,9 @@ using System;
29 29
30namespace OpenSim.Services.Connectors 30namespace OpenSim.Services.Connectors
31{ 31{
32 public class UserGridServiceConnector 32 public class GridUserServiceConnector
33 { 33 {
34 public UserGridServiceConnector() 34 public GridUserServiceConnector()
35 { 35 {
36 } 36 }
37 } 37 }
diff --git a/OpenSim/Services/Interfaces/IUserGridService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 50134e0..a7c2c6f 100644
--- a/OpenSim/Services/Interfaces/IUserGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -34,16 +34,16 @@ namespace OpenSim.Services.Interfaces
34 /// <summary> 34 /// <summary>
35 /// Records user information specific to a grid but which is not part of a user's account. 35 /// Records user information specific to a grid but which is not part of a user's account.
36 /// </summary> 36 /// </summary>
37 public class UserGridInfo 37 public class GridUserInfo
38 { 38 {
39 public string UserID; 39 public string UserID;
40 public UUID HomeRegionID; 40 public UUID HomeRegionID;
41 public Vector3 HomePosition; 41 public Vector3 HomePosition;
42 public Vector3 HomeLookAt; 42 public Vector3 HomeLookAt;
43 43
44 public UserGridInfo() {} 44 public GridUserInfo() {}
45 45
46 public UserGridInfo(Dictionary<string, object> kvp) 46 public GridUserInfo(Dictionary<string, object> kvp)
47 { 47 {
48 if (kvp.ContainsKey("UserID")) 48 if (kvp.ContainsKey("UserID"))
49 UserID = kvp["UserID"].ToString(); 49 UserID = kvp["UserID"].ToString();
@@ -67,9 +67,9 @@ namespace OpenSim.Services.Interfaces
67 } 67 }
68 } 68 }
69 69
70 public interface IUserGridService 70 public interface IGridUserService
71 { 71 {
72 UserGridInfo GetUserGridInfo(string userID); 72 GridUserInfo GetGridUserInfo(string userID);
73 bool StoreUserGridInfo(UserGridInfo info); 73 bool StoreGridUserInfo(GridUserInfo info);
74 } 74 }
75} \ No newline at end of file 75} \ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserGridService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 2d28b33..36cce75 100644
--- a/OpenSim/Services/UserAccountService/UserGridService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -39,20 +39,20 @@ using log4net;
39 39
40namespace OpenSim.Services.UserAccountService 40namespace OpenSim.Services.UserAccountService
41{ 41{
42 public class UserGridService : UserGridServiceBase, IUserGridService 42 public class GridUserService : GridUserServiceBase, IGridUserService
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 public UserGridService(IConfigSource config) : base(config) 46 public GridUserService(IConfigSource config) : base(config)
47 { 47 {
48 m_log.Debug("[USER GRID SERVICE]: Starting user grid service"); 48 m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
49 } 49 }
50 50
51 public UserGridInfo GetUserGridInfo(string userID) 51 public GridUserInfo GetGridUserInfo(string userID)
52 { 52 {
53 UserGridData d = m_Database.GetUserGridData(userID); 53 GridUserData d = m_Database.GetGridUserData(userID);
54 54
55 UserGridInfo info = new UserGridInfo(); 55 GridUserInfo info = new GridUserInfo();
56 info.UserID = d.UserID; 56 info.UserID = d.UserID;
57 info.HomeRegionID = new UUID(d.Data["HomeRegionID"]); 57 info.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
58 info.HomePosition = Vector3.Parse(d.Data["HomePosition"]); 58 info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
@@ -61,16 +61,16 @@ namespace OpenSim.Services.UserAccountService
61 return info; 61 return info;
62 } 62 }
63 63
64 public bool StoreUserGridInfo(UserGridInfo info) 64 public bool StoreGridUserInfo(GridUserInfo info)
65 { 65 {
66 UserGridData d = new UserGridData(); 66 GridUserData d = new GridUserData();
67 67
68 d.Data["UserID"] = info.UserID; 68 d.Data["UserID"] = info.UserID;
69 d.Data["HomeRegionID"] = info.HomeRegionID.ToString(); 69 d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
70 d.Data["HomePosition"] = info.HomePosition.ToString(); 70 d.Data["HomePosition"] = info.HomePosition.ToString();
71 d.Data["HomeLookAt"] = info.HomeLookAt.ToString(); 71 d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
72 72
73 return m_Database.StoreUserGridData(d); 73 return m_Database.StoreGridUserData(d);
74 } 74 }
75 } 75 }
76} \ No newline at end of file 76} \ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
index 80aaa49..990cb63 100644
--- a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs
+++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
@@ -35,15 +35,15 @@ using OpenSim.Services.Base;
35 35
36namespace OpenSim.Services.UserAccountService 36namespace OpenSim.Services.UserAccountService
37{ 37{
38 public class UserGridServiceBase : ServiceBase 38 public class GridUserServiceBase : ServiceBase
39 { 39 {
40 protected IUserGridData m_Database = null; 40 protected IGridUserData m_Database = null;
41 41
42 public UserGridServiceBase(IConfigSource config) : base(config) 42 public GridUserServiceBase(IConfigSource config) : base(config)
43 { 43 {
44 string dllName = String.Empty; 44 string dllName = String.Empty;
45 string connString = String.Empty; 45 string connString = String.Empty;
46 string realm = "UserGrid"; 46 string realm = "GridUser";
47 47
48 // 48 //
49 // Try reading the [DatabaseService] section, if it exists 49 // Try reading the [DatabaseService] section, if it exists
@@ -58,9 +58,9 @@ namespace OpenSim.Services.UserAccountService
58 } 58 }
59 59
60 // 60 //
61 // [PresenceService] section overrides [DatabaseService], if it exists 61 // [GridUsetService] section overrides [DatabaseService], if it exists
62 // 62 //
63 IConfig presenceConfig = config.Configs["PresenceService"]; 63 IConfig presenceConfig = config.Configs["GridUserService"];
64 if (presenceConfig != null) 64 if (presenceConfig != null)
65 { 65 {
66 dllName = presenceConfig.GetString("StorageProvider", dllName); 66 dllName = presenceConfig.GetString("StorageProvider", dllName);
@@ -74,7 +74,7 @@ namespace OpenSim.Services.UserAccountService
74 if (dllName.Equals(String.Empty)) 74 if (dllName.Equals(String.Empty))
75 throw new Exception("No StorageProvider configured"); 75 throw new Exception("No StorageProvider configured");
76 76
77 m_Database = LoadPlugin<IUserGridData>(dllName, new Object[] { connString, realm }); 77 m_Database = LoadPlugin<IGridUserData>(dllName, new Object[] { connString, realm });
78 if (m_Database == null) 78 if (m_Database == null)
79 throw new Exception("Could not find a storage interface in the given module " + dllName); 79 throw new Exception("Could not find a storage interface in the given module " + dllName);
80 } 80 }