aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut
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/Region/CoreModules/ServiceConnectorsOut
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/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs)32
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
index f4309fe..d5fae23 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
@@ -37,13 +37,13 @@ using OpenSim.Services.Interfaces;
37 37
38using OpenMetaverse; 38using OpenMetaverse;
39 39
40namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid 40namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
41{ 41{
42 public class LocalUserGridServicesConnector : ISharedRegionModule, IUserGridService 42 public class LocalGridUserServicesConnector : ISharedRegionModule, 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 private IUserGridService m_service; 46 private IGridUserService m_service;
47 47
48 private bool m_Enabled = false; 48 private bool m_Enabled = false;
49 49
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid
54 54
55 public string Name 55 public string Name
56 { 56 {
57 get { return "LocalUserGridServicesConnector"; } 57 get { return "LocalGridUserServicesConnector"; }
58 } 58 }
59 59
60 public void Initialise(IConfigSource source) 60 public void Initialise(IConfigSource source)
@@ -62,13 +62,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid
62 IConfig moduleConfig = source.Configs["Modules"]; 62 IConfig moduleConfig = source.Configs["Modules"];
63 if (moduleConfig != null) 63 if (moduleConfig != null)
64 { 64 {
65 string name = moduleConfig.GetString("UserGridServices", ""); 65 string name = moduleConfig.GetString("GridUserServices", "");
66 if (name == Name) 66 if (name == Name)
67 { 67 {
68 IConfig userConfig = source.Configs["UserGridService"]; 68 IConfig userConfig = source.Configs["GridUserService"];
69 if (userConfig == null) 69 if (userConfig == null)
70 { 70 {
71 m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: UserGridService missing from ini files"); 71 m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: GridUserService missing from ini files");
72 return; 72 return;
73 } 73 }
74 74
@@ -76,20 +76,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid
76 76
77 if (serviceDll == String.Empty) 77 if (serviceDll == String.Empty)
78 { 78 {
79 m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: No LocalServiceModule named in section UserGridService"); 79 m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: No LocalServiceModule named in section GridUserService");
80 return; 80 return;
81 } 81 }
82 82
83 Object[] args = new Object[] { source }; 83 Object[] args = new Object[] { source };
84 m_service = ServerUtils.LoadPlugin<IUserGridService>(serviceDll, args); 84 m_service = ServerUtils.LoadPlugin<IGridUserService>(serviceDll, args);
85 85
86 if (m_service == null) 86 if (m_service == null)
87 { 87 {
88 m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: Can't load UserGrid service"); 88 m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: Can't load GridUser service");
89 return; 89 return;
90 } 90 }
91 m_Enabled = true; 91 m_Enabled = true;
92 m_log.Info("[LOCAL USER GRID SERVICE CONNECTOR]: Local UserGrid connector enabled"); 92 m_log.Info("[LOCAL GRID USER SERVICE CONNECTOR]: Local GridUser connector enabled");
93 } 93 }
94 } 94 }
95 } 95 }
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid
111 if (!m_Enabled) 111 if (!m_Enabled)
112 return; 112 return;
113 113
114 scene.RegisterModuleInterface<IUserGridService>(m_service); 114 scene.RegisterModuleInterface<IGridUserService>(m_service);
115 } 115 }
116 116
117 public void RemoveRegion(Scene scene) 117 public void RemoveRegion(Scene scene)
@@ -126,14 +126,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid
126 return; 126 return;
127 } 127 }
128 128
129 public UserGridInfo GetUserGridInfo(string userID) 129 public GridUserInfo GetGridUserInfo(string userID)
130 { 130 {
131 return m_service.GetUserGridInfo(userID); 131 return m_service.GetGridUserInfo(userID);
132 } 132 }
133 133
134 public bool StoreUserGridInfo(UserGridInfo info) 134 public bool StoreGridUserInfo(GridUserInfo info)
135 { 135 {
136 return m_service.StoreUserGridInfo(info); 136 return m_service.StoreGridUserInfo(info);
137 } 137 }
138 } 138 }
139} \ No newline at end of file 139} \ No newline at end of file