aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserManager/UserManagerBase.cs
diff options
context:
space:
mode:
authorlbsa712007-09-24 01:31:00 +0000
committerlbsa712007-09-24 01:31:00 +0000
commit47256cebda8f6519ab09fe66b64deb28f0702042 (patch)
tree8a1d43d087f5d69a981179cbad018d3bc74b6eb3 /OpenSim/Framework/UserManager/UserManagerBase.cs
parent* minor renames (diff)
downloadopensim-SC_OLD-47256cebda8f6519ab09fe66b64deb28f0702042.zip
opensim-SC_OLD-47256cebda8f6519ab09fe66b64deb28f0702042.tar.gz
opensim-SC_OLD-47256cebda8f6519ab09fe66b64deb28f0702042.tar.bz2
opensim-SC_OLD-47256cebda8f6519ab09fe66b64deb28f0702042.tar.xz
* Renamed methods on IUserData
Diffstat (limited to 'OpenSim/Framework/UserManager/UserManagerBase.cs')
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs25
1 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index 82b3731..e11204b 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -68,8 +68,7 @@ namespace OpenSim.Framework.UserManagement
68 { 68 {
69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 70 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug); 71 AddPlugin(plug);
72 MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
73 } 72 }
74 73
75 typeInterface = null; 74 typeInterface = null;
@@ -79,6 +78,12 @@ namespace OpenSim.Framework.UserManagement
79 pluginAssembly = null; 78 pluginAssembly = null;
80 } 79 }
81 80
81 private void AddPlugin(IUserData plug)
82 {
83 this._plugins.Add(plug.getName(), plug);
84 MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
85 }
86
82 #region Get UserProfile 87 #region Get UserProfile
83 /// <summary> 88 /// <summary>
84 /// Loads a user profile from a database by UUID 89 /// Loads a user profile from a database by UUID
@@ -91,7 +96,7 @@ namespace OpenSim.Framework.UserManagement
91 { 96 {
92 try 97 try
93 { 98 {
94 UserProfileData profile = plugin.Value.getUserByUUID(uuid); 99 UserProfileData profile = plugin.Value.GetUserByUUID(uuid);
95 profile.currentAgent = getUserAgent(profile.UUID); 100 profile.currentAgent = getUserAgent(profile.UUID);
96 return profile; 101 return profile;
97 } 102 }
@@ -116,7 +121,7 @@ namespace OpenSim.Framework.UserManagement
116 { 121 {
117 try 122 try
118 { 123 {
119 UserProfileData profile = plugin.Value.getUserByName(name); 124 UserProfileData profile = plugin.Value.GetUserByName(name);
120 profile.currentAgent = getUserAgent(profile.UUID); 125 profile.currentAgent = getUserAgent(profile.UUID);
121 return profile; 126 return profile;
122 } 127 }
@@ -142,7 +147,7 @@ namespace OpenSim.Framework.UserManagement
142 { 147 {
143 try 148 try
144 { 149 {
145 UserProfileData profile = plugin.Value.getUserByName(fname,lname); 150 UserProfileData profile = plugin.Value.GetUserByName(fname,lname);
146 151
147 profile.currentAgent = getUserAgent(profile.UUID); 152 profile.currentAgent = getUserAgent(profile.UUID);
148 153
@@ -168,7 +173,7 @@ namespace OpenSim.Framework.UserManagement
168 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 173 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
169 { 174 {
170 try { 175 try {
171 plugin.Value.updateUserProfile(data); 176 plugin.Value.UpdateUserProfile(data);
172 return true; 177 return true;
173 } catch (Exception e) { 178 } catch (Exception e) {
174 MainLog.Instance.Verbose( "Unable to set user via " + plugin.Key + "(" + e.ToString() + ")"); 179 MainLog.Instance.Verbose( "Unable to set user via " + plugin.Key + "(" + e.ToString() + ")");
@@ -192,7 +197,7 @@ namespace OpenSim.Framework.UserManagement
192 { 197 {
193 try 198 try
194 { 199 {
195 return plugin.Value.getAgentByUUID(uuid); 200 return plugin.Value.GetAgentByUUID(uuid);
196 } 201 }
197 catch (Exception e) 202 catch (Exception e)
198 { 203 {
@@ -214,7 +219,7 @@ namespace OpenSim.Framework.UserManagement
214 { 219 {
215 try 220 try
216 { 221 {
217 return plugin.Value.getAgentByName(name); 222 return plugin.Value.GetAgentByName(name);
218 } 223 }
219 catch (Exception e) 224 catch (Exception e)
220 { 225 {
@@ -246,7 +251,7 @@ namespace OpenSim.Framework.UserManagement
246 { 251 {
247 try 252 try
248 { 253 {
249 return plugin.Value.getAgentByName(fname,lname); 254 return plugin.Value.GetAgentByName(fname,lname);
250 } 255 }
251 catch (Exception e) 256 catch (Exception e)
252 { 257 {
@@ -360,7 +365,7 @@ namespace OpenSim.Framework.UserManagement
360 { 365 {
361 try 366 try
362 { 367 {
363 plugin.Value.addNewUserProfile(user); 368 plugin.Value.AddNewUserProfile(user);
364 369
365 } 370 }
366 catch (Exception e) 371 catch (Exception e)