aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oUserData.cs32
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs32
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteUserData.cs34
-rw-r--r--OpenSim/Framework/Data/UserData.cs24
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs25
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs10
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs19
7 files changed, 92 insertions, 84 deletions
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 402cf24..2ab1488 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Data.DB4o
55 /// </summary> 55 /// </summary>
56 /// <param name="uuid">The users UUID</param> 56 /// <param name="uuid">The users UUID</param>
57 /// <returns>A user profile</returns> 57 /// <returns>A user profile</returns>
58 public UserProfileData getUserByUUID(LLUUID uuid) 58 public UserProfileData GetUserByUUID(LLUUID uuid)
59 { 59 {
60 if(manager.userProfiles.ContainsKey(uuid)) 60 if(manager.userProfiles.ContainsKey(uuid))
61 return manager.userProfiles[uuid]; 61 return manager.userProfiles[uuid];
@@ -67,9 +67,9 @@ namespace OpenSim.Framework.Data.DB4o
67 /// </summary> 67 /// </summary>
68 /// <param name="name">The users account name</param> 68 /// <param name="name">The users account name</param>
69 /// <returns>A matching users profile</returns> 69 /// <returns>A matching users profile</returns>
70 public UserProfileData getUserByName(string name) 70 public UserProfileData GetUserByName(string name)
71 { 71 {
72 return getUserByName(name.Split(' ')[0], name.Split(' ')[1]); 72 return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]);
73 } 73 }
74 74
75 /// <summary> 75 /// <summary>
@@ -78,7 +78,7 @@ namespace OpenSim.Framework.Data.DB4o
78 /// <param name="fname">The first part of the users account name</param> 78 /// <param name="fname">The first part of the users account name</param>
79 /// <param name="lname">The second part of the users account name</param> 79 /// <param name="lname">The second part of the users account name</param>
80 /// <returns>A matching users profile</returns> 80 /// <returns>A matching users profile</returns>
81 public UserProfileData getUserByName(string fname, string lname) 81 public UserProfileData GetUserByName(string fname, string lname)
82 { 82 {
83 foreach (UserProfileData profile in manager.userProfiles.Values) 83 foreach (UserProfileData profile in manager.userProfiles.Values)
84 { 84 {
@@ -93,11 +93,11 @@ namespace OpenSim.Framework.Data.DB4o
93 /// </summary> 93 /// </summary>
94 /// <param name="uuid">The users account ID</param> 94 /// <param name="uuid">The users account ID</param>
95 /// <returns>A matching users profile</returns> 95 /// <returns>A matching users profile</returns>
96 public UserAgentData getAgentByUUID(LLUUID uuid) 96 public UserAgentData GetAgentByUUID(LLUUID uuid)
97 { 97 {
98 try 98 try
99 { 99 {
100 return getUserByUUID(uuid).currentAgent; 100 return GetUserByUUID(uuid).currentAgent;
101 } 101 }
102 catch (Exception) 102 catch (Exception)
103 { 103 {
@@ -110,9 +110,9 @@ namespace OpenSim.Framework.Data.DB4o
110 /// </summary> 110 /// </summary>
111 /// <param name="name">The account name</param> 111 /// <param name="name">The account name</param>
112 /// <returns>The users session agent</returns> 112 /// <returns>The users session agent</returns>
113 public UserAgentData getAgentByName(string name) 113 public UserAgentData GetAgentByName(string name)
114 { 114 {
115 return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]); 115 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
116 } 116 }
117 117
118 /// <summary> 118 /// <summary>
@@ -121,11 +121,11 @@ namespace OpenSim.Framework.Data.DB4o
121 /// <param name="fname">The first part of the users account name</param> 121 /// <param name="fname">The first part of the users account name</param>
122 /// <param name="lname">The second part of the users account name</param> 122 /// <param name="lname">The second part of the users account name</param>
123 /// <returns>A user agent</returns> 123 /// <returns>A user agent</returns>
124 public UserAgentData getAgentByName(string fname, string lname) 124 public UserAgentData GetAgentByName(string fname, string lname)
125 { 125 {
126 try 126 try
127 { 127 {
128 return getUserByName(fname,lname).currentAgent; 128 return GetUserByName(fname,lname).currentAgent;
129 } 129 }
130 catch (Exception) 130 catch (Exception)
131 { 131 {
@@ -137,7 +137,7 @@ namespace OpenSim.Framework.Data.DB4o
137 /// Creates a new user profile 137 /// Creates a new user profile
138 /// </summary> 138 /// </summary>
139 /// <param name="user">The profile to add to the database</param> 139 /// <param name="user">The profile to add to the database</param>
140 public void addNewUserProfile(UserProfileData user) 140 public void AddNewUserProfile(UserProfileData user)
141 { 141 {
142 try 142 try
143 { 143 {
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Data.DB4o
154 /// </summary> 154 /// </summary>
155 /// <param name="user">The profile to add to the database</param> 155 /// <param name="user">The profile to add to the database</param>
156 /// <returns>True on success, false on error</returns> 156 /// <returns>True on success, false on error</returns>
157 public bool updateUserProfile(UserProfileData user) 157 public bool UpdateUserProfile(UserProfileData user)
158 { 158 {
159 try { 159 try {
160 return manager.UpdateRecord(user); 160 return manager.UpdateRecord(user);
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Data.DB4o
170 /// Creates a new user agent 170 /// Creates a new user agent
171 /// </summary> 171 /// </summary>
172 /// <param name="agent">The agent to add to the database</param> 172 /// <param name="agent">The agent to add to the database</param>
173 public void addNewUserAgent(UserAgentData agent) 173 public void AddNewUserAgent(UserAgentData agent)
174 { 174 {
175 // Do nothing. yet. 175 // Do nothing. yet.
176 } 176 }
@@ -182,7 +182,7 @@ namespace OpenSim.Framework.Data.DB4o
182 /// <param name="to">End account</param> 182 /// <param name="to">End account</param>
183 /// <param name="amount">The amount to move</param> 183 /// <param name="amount">The amount to move</param>
184 /// <returns>Success?</returns> 184 /// <returns>Success?</returns>
185 public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount) 185 public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount)
186 { 186 {
187 return true; 187 return true;
188 } 188 }
@@ -195,7 +195,7 @@ namespace OpenSim.Framework.Data.DB4o
195 /// <param name="to">Recievers account</param> 195 /// <param name="to">Recievers account</param>
196 /// <param name="item">Inventory item</param> 196 /// <param name="item">Inventory item</param>
197 /// <returns>Success?</returns> 197 /// <returns>Success?</returns>
198 public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 198 public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
199 { 199 {
200 return true; 200 return true;
201 } 201 }
@@ -213,7 +213,7 @@ namespace OpenSim.Framework.Data.DB4o
213 /// Returns the version of the storage provider 213 /// Returns the version of the storage provider
214 /// </summary> 214 /// </summary>
215 /// <returns>Storage provider version</returns> 215 /// <returns>Storage provider version</returns>
216 public string getVersion() 216 public string GetVersion()
217 { 217 {
218 return "0.1"; 218 return "0.1";
219 } 219 }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 633bef7..e746717 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -65,9 +65,9 @@ namespace OpenSim.Framework.Data.MySQL
65 /// </summary> 65 /// </summary>
66 /// <param name="name">The account name of the user</param> 66 /// <param name="name">The account name of the user</param>
67 /// <returns>A user profile</returns> 67 /// <returns>A user profile</returns>
68 public UserProfileData getUserByName(string name) 68 public UserProfileData GetUserByName(string name)
69 { 69 {
70 return getUserByName(name.Split(' ')[0], name.Split(' ')[1]); 70 return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]);
71 } 71 }
72 72
73 /// <summary> 73 /// <summary>
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Data.MySQL
76 /// <param name="user">The first part of the account name</param> 76 /// <param name="user">The first part of the account name</param>
77 /// <param name="last">The second part of the account name</param> 77 /// <param name="last">The second part of the account name</param>
78 /// <returns>A user profile</returns> 78 /// <returns>A user profile</returns>
79 public UserProfileData getUserByName(string user, string last) 79 public UserProfileData GetUserByName(string user, string last)
80 { 80 {
81 try 81 try
82 { 82 {
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Data.MySQL
110 /// </summary> 110 /// </summary>
111 /// <param name="uuid">The account ID</param> 111 /// <param name="uuid">The account ID</param>
112 /// <returns>The users profile</returns> 112 /// <returns>The users profile</returns>
113 public UserProfileData getUserByUUID(LLUUID uuid) 113 public UserProfileData GetUserByUUID(LLUUID uuid)
114 { 114 {
115 try 115 try
116 { 116 {
@@ -143,9 +143,9 @@ namespace OpenSim.Framework.Data.MySQL
143 /// </summary> 143 /// </summary>
144 /// <param name="name">The account name</param> 144 /// <param name="name">The account name</param>
145 /// <returns>The users session</returns> 145 /// <returns>The users session</returns>
146 public UserAgentData getAgentByName(string name) 146 public UserAgentData GetAgentByName(string name)
147 { 147 {
148 return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]); 148 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
149 } 149 }
150 150
151 /// <summary> 151 /// <summary>
@@ -154,10 +154,10 @@ namespace OpenSim.Framework.Data.MySQL
154 /// <param name="user">First part of the users account name</param> 154 /// <param name="user">First part of the users account name</param>
155 /// <param name="last">Second part of the users account name</param> 155 /// <param name="last">Second part of the users account name</param>
156 /// <returns>The users session</returns> 156 /// <returns>The users session</returns>
157 public UserAgentData getAgentByName(string user, string last) 157 public UserAgentData GetAgentByName(string user, string last)
158 { 158 {
159 UserProfileData profile = getUserByName(user, last); 159 UserProfileData profile = GetUserByName(user, last);
160 return getAgentByUUID(profile.UUID); 160 return GetAgentByUUID(profile.UUID);
161 } 161 }
162 162
163 /// <summary> 163 /// <summary>
@@ -165,7 +165,7 @@ namespace OpenSim.Framework.Data.MySQL
165 /// </summary> 165 /// </summary>
166 /// <param name="uuid">The accounts UUID</param> 166 /// <param name="uuid">The accounts UUID</param>
167 /// <returns>The users session</returns> 167 /// <returns>The users session</returns>
168 public UserAgentData getAgentByUUID(LLUUID uuid) 168 public UserAgentData GetAgentByUUID(LLUUID uuid)
169 { 169 {
170 try 170 try
171 { 171 {
@@ -197,7 +197,7 @@ namespace OpenSim.Framework.Data.MySQL
197 /// Creates a new users profile 197 /// Creates a new users profile
198 /// </summary> 198 /// </summary>
199 /// <param name="user">The user profile to create</param> 199 /// <param name="user">The user profile to create</param>
200 public void addNewUserProfile(UserProfileData user) 200 public void AddNewUserProfile(UserProfileData user)
201 { 201 {
202 try 202 try
203 { 203 {
@@ -220,13 +220,13 @@ namespace OpenSim.Framework.Data.MySQL
220 /// Creates a new agent 220 /// Creates a new agent
221 /// </summary> 221 /// </summary>
222 /// <param name="agent">The agent to create</param> 222 /// <param name="agent">The agent to create</param>
223 public void addNewUserAgent(UserAgentData agent) 223 public void AddNewUserAgent(UserAgentData agent)
224 { 224 {
225 // Do nothing. 225 // Do nothing.
226 } 226 }
227 227
228 228
229 public bool updateUserProfile(UserProfileData user) 229 public bool UpdateUserProfile(UserProfileData user)
230 { 230 {
231 return true; 231 return true;
232 // TODO: implement 232 // TODO: implement
@@ -239,7 +239,7 @@ namespace OpenSim.Framework.Data.MySQL
239 /// <param name="to">The recievers account ID</param> 239 /// <param name="to">The recievers account ID</param>
240 /// <param name="amount">The amount to transfer</param> 240 /// <param name="amount">The amount to transfer</param>
241 /// <returns>Success?</returns> 241 /// <returns>Success?</returns>
242 public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount) 242 public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount)
243 { 243 {
244 return false; 244 return false;
245 } 245 }
@@ -252,7 +252,7 @@ namespace OpenSim.Framework.Data.MySQL
252 /// <param name="to">The recievers account ID</param> 252 /// <param name="to">The recievers account ID</param>
253 /// <param name="item">The item to transfer</param> 253 /// <param name="item">The item to transfer</param>
254 /// <returns>Success?</returns> 254 /// <returns>Success?</returns>
255 public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 255 public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
256 { 256 {
257 return false; 257 return false;
258 } 258 }
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Data.MySQL
270 /// Database provider version 270 /// Database provider version
271 /// </summary> 271 /// </summary>
272 /// <returns>provider version</returns> 272 /// <returns>provider version</returns>
273 public string getVersion() 273 public string GetVersion()
274 { 274 {
275 return "0.1"; 275 return "0.1";
276 } 276 }
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index 76be89c..3a13ecc 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Data.SQLite
76 /// </summary> 76 /// </summary>
77 /// <param name="uuid">The users UUID</param> 77 /// <param name="uuid">The users UUID</param>
78 /// <returns>A user profile</returns> 78 /// <returns>A user profile</returns>
79 public UserProfileData getUserByUUID(LLUUID uuid) 79 public UserProfileData GetUserByUUID(LLUUID uuid)
80 { 80 {
81 lock (ds) { 81 lock (ds) {
82 DataRow row = ds.Tables["users"].Rows.Find(uuid); 82 DataRow row = ds.Tables["users"].Rows.Find(uuid);
@@ -98,9 +98,9 @@ namespace OpenSim.Framework.Data.SQLite
98 /// </summary> 98 /// </summary>
99 /// <param name="name">The users account name</param> 99 /// <param name="name">The users account name</param>
100 /// <returns>A matching users profile</returns> 100 /// <returns>A matching users profile</returns>
101 public UserProfileData getUserByName(string name) 101 public UserProfileData GetUserByName(string name)
102 { 102 {
103 return getUserByName(name.Split(' ')[0], name.Split(' ')[1]); 103 return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]);
104 } 104 }
105 105
106 /// <summary> 106 /// <summary>
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Data.SQLite
109 /// <param name="fname">The first part of the users account name</param> 109 /// <param name="fname">The first part of the users account name</param>
110 /// <param name="lname">The second part of the users account name</param> 110 /// <param name="lname">The second part of the users account name</param>
111 /// <returns>A matching users profile</returns> 111 /// <returns>A matching users profile</returns>
112 public UserProfileData getUserByName(string fname, string lname) 112 public UserProfileData GetUserByName(string fname, string lname)
113 { 113 {
114 string select = "surname = '" + lname + "' and username = '" + fname + "'"; 114 string select = "surname = '" + lname + "' and username = '" + fname + "'";
115 lock (ds) { 115 lock (ds) {
@@ -132,11 +132,11 @@ namespace OpenSim.Framework.Data.SQLite
132 /// </summary> 132 /// </summary>
133 /// <param name="uuid">The users account ID</param> 133 /// <param name="uuid">The users account ID</param>
134 /// <returns>A matching users profile</returns> 134 /// <returns>A matching users profile</returns>
135 public UserAgentData getAgentByUUID(LLUUID uuid) 135 public UserAgentData GetAgentByUUID(LLUUID uuid)
136 { 136 {
137 try 137 try
138 { 138 {
139 return getUserByUUID(uuid).currentAgent; 139 return GetUserByUUID(uuid).currentAgent;
140 } 140 }
141 catch (Exception) 141 catch (Exception)
142 { 142 {
@@ -149,9 +149,9 @@ namespace OpenSim.Framework.Data.SQLite
149 /// </summary> 149 /// </summary>
150 /// <param name="name">The account name</param> 150 /// <param name="name">The account name</param>
151 /// <returns>The users session agent</returns> 151 /// <returns>The users session agent</returns>
152 public UserAgentData getAgentByName(string name) 152 public UserAgentData GetAgentByName(string name)
153 { 153 {
154 return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]); 154 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
155 } 155 }
156 156
157 /// <summary> 157 /// <summary>
@@ -160,11 +160,11 @@ namespace OpenSim.Framework.Data.SQLite
160 /// <param name="fname">The first part of the users account name</param> 160 /// <param name="fname">The first part of the users account name</param>
161 /// <param name="lname">The second part of the users account name</param> 161 /// <param name="lname">The second part of the users account name</param>
162 /// <returns>A user agent</returns> 162 /// <returns>A user agent</returns>
163 public UserAgentData getAgentByName(string fname, string lname) 163 public UserAgentData GetAgentByName(string fname, string lname)
164 { 164 {
165 try 165 try
166 { 166 {
167 return getUserByName(fname,lname).currentAgent; 167 return GetUserByName(fname,lname).currentAgent;
168 } 168 }
169 catch (Exception) 169 catch (Exception)
170 { 170 {
@@ -176,7 +176,7 @@ namespace OpenSim.Framework.Data.SQLite
176 /// Creates a new user profile 176 /// Creates a new user profile
177 /// </summary> 177 /// </summary>
178 /// <param name="user">The profile to add to the database</param> 178 /// <param name="user">The profile to add to the database</param>
179 public void addNewUserProfile(UserProfileData user) 179 public void AddNewUserProfile(UserProfileData user)
180 { 180 {
181 DataTable users = ds.Tables["users"]; 181 DataTable users = ds.Tables["users"];
182 lock (ds) { 182 lock (ds) {
@@ -217,10 +217,10 @@ namespace OpenSim.Framework.Data.SQLite
217 /// </summary> 217 /// </summary>
218 /// <param name="user">The profile to add to the database</param> 218 /// <param name="user">The profile to add to the database</param>
219 /// <returns>True on success, false on error</returns> 219 /// <returns>True on success, false on error</returns>
220 public bool updateUserProfile(UserProfileData user) 220 public bool UpdateUserProfile(UserProfileData user)
221 { 221 {
222 try { 222 try {
223 addNewUserProfile(user); 223 AddNewUserProfile(user);
224 return true; 224 return true;
225 } catch (Exception) { 225 } catch (Exception) {
226 return false; 226 return false;
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Data.SQLite
231 /// Creates a new user agent 231 /// Creates a new user agent
232 /// </summary> 232 /// </summary>
233 /// <param name="agent">The agent to add to the database</param> 233 /// <param name="agent">The agent to add to the database</param>
234 public void addNewUserAgent(UserAgentData agent) 234 public void AddNewUserAgent(UserAgentData agent)
235 { 235 {
236 // Do nothing. yet. 236 // Do nothing. yet.
237 } 237 }
@@ -243,7 +243,7 @@ namespace OpenSim.Framework.Data.SQLite
243 /// <param name="to">End account</param> 243 /// <param name="to">End account</param>
244 /// <param name="amount">The amount to move</param> 244 /// <param name="amount">The amount to move</param>
245 /// <returns>Success?</returns> 245 /// <returns>Success?</returns>
246 public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount) 246 public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount)
247 { 247 {
248 return true; 248 return true;
249 } 249 }
@@ -256,7 +256,7 @@ namespace OpenSim.Framework.Data.SQLite
256 /// <param name="to">Recievers account</param> 256 /// <param name="to">Recievers account</param>
257 /// <param name="item">Inventory item</param> 257 /// <param name="item">Inventory item</param>
258 /// <returns>Success?</returns> 258 /// <returns>Success?</returns>
259 public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 259 public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
260 { 260 {
261 return true; 261 return true;
262 } 262 }
@@ -274,7 +274,7 @@ namespace OpenSim.Framework.Data.SQLite
274 /// Returns the version of the storage provider 274 /// Returns the version of the storage provider
275 /// </summary> 275 /// </summary>
276 /// <returns>Storage provider version</returns> 276 /// <returns>Storage provider version</returns>
277 public string getVersion() 277 public string GetVersion()
278 { 278 {
279 return "0.1"; 279 return "0.1";
280 } 280 }
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs
index 6e743e7..13bdf17 100644
--- a/OpenSim/Framework/Data/UserData.cs
+++ b/OpenSim/Framework/Data/UserData.cs
@@ -39,14 +39,14 @@ namespace OpenSim.Framework.Data
39 /// </summary> 39 /// </summary>
40 /// <param name="user">The accounts UUID</param> 40 /// <param name="user">The accounts UUID</param>
41 /// <returns>The user data profile</returns> 41 /// <returns>The user data profile</returns>
42 UserProfileData getUserByUUID(LLUUID user); 42 UserProfileData GetUserByUUID(LLUUID user);
43 43
44 /// <summary> 44 /// <summary>
45 /// Returns a users profile by searching their username 45 /// Returns a users profile by searching their username
46 /// </summary> 46 /// </summary>
47 /// <param name="name">The users username</param> 47 /// <param name="name">The users username</param>
48 /// <returns>The user data profile</returns> 48 /// <returns>The user data profile</returns>
49 UserProfileData getUserByName(string name); 49 UserProfileData GetUserByName(string name);
50 50
51 /// <summary> 51 /// <summary>
52 /// Returns a users profile by searching their username parts 52 /// Returns a users profile by searching their username parts
@@ -54,21 +54,21 @@ namespace OpenSim.Framework.Data
54 /// <param name="fname">Account firstname</param> 54 /// <param name="fname">Account firstname</param>
55 /// <param name="lname">Account lastname</param> 55 /// <param name="lname">Account lastname</param>
56 /// <returns>The user data profile</returns> 56 /// <returns>The user data profile</returns>
57 UserProfileData getUserByName(string fname, string lname); 57 UserProfileData GetUserByName(string fname, string lname);
58 58
59 /// <summary> 59 /// <summary>
60 /// Returns the current agent for a user searching by it's UUID 60 /// Returns the current agent for a user searching by it's UUID
61 /// </summary> 61 /// </summary>
62 /// <param name="user">The users UUID</param> 62 /// <param name="user">The users UUID</param>
63 /// <returns>The current agent session</returns> 63 /// <returns>The current agent session</returns>
64 UserAgentData getAgentByUUID(LLUUID user); 64 UserAgentData GetAgentByUUID(LLUUID user);
65 65
66 /// <summary> 66 /// <summary>
67 /// Returns the current session agent for a user searching by username 67 /// Returns the current session agent for a user searching by username
68 /// </summary> 68 /// </summary>
69 /// <param name="name">The users account name</param> 69 /// <param name="name">The users account name</param>
70 /// <returns>The current agent session</returns> 70 /// <returns>The current agent session</returns>
71 UserAgentData getAgentByName(string name); 71 UserAgentData GetAgentByName(string name);
72 72
73 /// <summary> 73 /// <summary>
74 /// Returns the current session agent for a user searching by username parts 74 /// Returns the current session agent for a user searching by username parts
@@ -76,25 +76,25 @@ namespace OpenSim.Framework.Data
76 /// <param name="fname">The users first account name</param> 76 /// <param name="fname">The users first account name</param>
77 /// <param name="lname">The users account surname</param> 77 /// <param name="lname">The users account surname</param>
78 /// <returns>The current agent session</returns> 78 /// <returns>The current agent session</returns>
79 UserAgentData getAgentByName(string fname, string lname); 79 UserAgentData GetAgentByName(string fname, string lname);
80 80
81 /// <summary> 81 /// <summary>
82 /// Adds a new User profile to the database 82 /// Adds a new User profile to the database
83 /// </summary> 83 /// </summary>
84 /// <param name="user">UserProfile to add</param> 84 /// <param name="user">UserProfile to add</param>
85 void addNewUserProfile(UserProfileData user); 85 void AddNewUserProfile(UserProfileData user);
86 86
87 /// <summary> 87 /// <summary>
88 /// Updates an existing user profile 88 /// Updates an existing user profile
89 /// </summary> 89 /// </summary>
90 /// <param name="user">UserProfile to update</param> 90 /// <param name="user">UserProfile to update</param>
91 bool updateUserProfile(UserProfileData user); 91 bool UpdateUserProfile(UserProfileData user);
92 92
93 /// <summary> 93 /// <summary>
94 /// Adds a new agent to the database 94 /// Adds a new agent to the database
95 /// </summary> 95 /// </summary>
96 /// <param name="agent">The agent to add</param> 96 /// <param name="agent">The agent to add</param>
97 void addNewUserAgent(UserAgentData agent); 97 void AddNewUserAgent(UserAgentData agent);
98 98
99 /// <summary> 99 /// <summary>
100 /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES) 100 /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES)
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Data
103 /// <param name="to">The account to transfer to</param> 103 /// <param name="to">The account to transfer to</param>
104 /// <param name="amount">The amount to transfer</param> 104 /// <param name="amount">The amount to transfer</param>
105 /// <returns>Successful?</returns> 105 /// <returns>Successful?</returns>
106 bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount); 106 bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
107 107
108 /// <summary> 108 /// <summary>
109 /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account. 109 /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account.
@@ -112,13 +112,13 @@ namespace OpenSim.Framework.Data
112 /// <param name="to">User to transfer to</param> 112 /// <param name="to">User to transfer to</param>
113 /// <param name="inventory">Specified inventory item</param> 113 /// <param name="inventory">Specified inventory item</param>
114 /// <returns>Successful?</returns> 114 /// <returns>Successful?</returns>
115 bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); 115 bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
116 116
117 /// <summary> 117 /// <summary>
118 /// Returns the plugin version 118 /// Returns the plugin version
119 /// </summary> 119 /// </summary>
120 /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> 120 /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns>
121 string getVersion(); 121 string GetVersion();
122 122
123 /// <summary> 123 /// <summary>
124 /// Returns the plugin name 124 /// Returns the plugin name
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)
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 0105b9d..1f54310 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,8 +44,14 @@ namespace OpenSim.Region.Communications.Local
44 public LocalUserServices UserServices; 44 public LocalUserServices UserServices;
45 public LocalLoginService LoginServices; 45 public LocalLoginService LoginServices;
46 public LocalInventoryService InvenServices; 46 public LocalInventoryService InvenServices;
47 // public CAPSService CapsServices; 47
48 private readonly LocalSettings m_settings; 48 protected LocalSettings m_settings;
49
50 protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache )
51 : base(serversInfo, httpServer, assetCache)
52 {
53
54 }
49 55
50 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings) 56 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings)
51 : base(serversInfo, httpServer, assetCache) 57 : base(serversInfo, httpServer, assetCache)
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 612f654..a7cefcb 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -1,10 +1,8 @@
1using System; 1using System;
2using libsecondlife;
3using OpenSim.Framework.Communications; 2using OpenSim.Framework.Communications;
4using OpenSim.Framework.Data; 3using OpenSim.Framework.Data;
5using OpenSim.Framework.Types; 4using OpenSim.Framework.Types;
6using OpenSim.Framework.UserManagement; 5using OpenSim.Framework.UserManagement;
7using OpenSim.Framework.Utilities;
8 6
9namespace OpenSim.Region.Communications.Local 7namespace OpenSim.Region.Communications.Local
10{ 8{
@@ -13,7 +11,7 @@ namespace OpenSim.Region.Communications.Local
13 private readonly CommunicationsLocal m_parent; 11 private readonly CommunicationsLocal m_parent;
14 12
15 private readonly NetworkServersInfo m_serversInfo; 13 private readonly NetworkServersInfo m_serversInfo;
16 private readonly uint m_defaultHomeX ; 14 private readonly uint m_defaultHomeX;
17 private readonly uint m_defaultHomeY; 15 private readonly uint m_defaultHomeY;
18 16
19 17
@@ -22,8 +20,8 @@ namespace OpenSim.Region.Communications.Local
22 m_parent = parent; 20 m_parent = parent;
23 m_serversInfo = serversInfo; 21 m_serversInfo = serversInfo;
24 22
25 m_defaultHomeX = this.m_serversInfo.DefaultHomeLocX; 23 m_defaultHomeX = m_serversInfo.DefaultHomeLocX;
26 m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY; 24 m_defaultHomeY = m_serversInfo.DefaultHomeLocY;
27 } 25 }
28 26
29 public UserProfileData SetupMasterUser(string firstName, string lastName) 27 public UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -33,17 +31,16 @@ namespace OpenSim.Region.Communications.Local
33 31
34 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 32 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
35 { 33 {
36 UserProfileData profile = base.GetUserProfile(firstName, lastName); 34 UserProfileData profile = GetUserProfile(firstName, lastName);
37 if (profile != null) 35 if (profile != null)
38 { 36 {
39
40 return profile; 37 return profile;
41 } 38 }
42 39
43 Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); 40 Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");
44 this.AddUserProfile(firstName, lastName, password, m_defaultHomeX, m_defaultHomeY); 41 AddUserProfile(firstName, lastName, password, m_defaultHomeX, m_defaultHomeY);
45 42
46 profile = base.GetUserProfile(firstName, lastName); 43 profile = GetUserProfile(firstName, lastName);
47 44
48 if (profile == null) 45 if (profile == null)
49 { 46 {
@@ -51,10 +48,10 @@ namespace OpenSim.Region.Communications.Local
51 } 48 }
52 else 49 else
53 { 50 {
54 m_parent.InvenServices.CreateNewUserInventory(profile.UUID); 51 m_parent.InvenServices.CreateNewUserInventory(profile.UUID);
55 } 52 }
56 53
57 return profile; 54 return profile;
58 } 55 }
59 } 56 }
60} 57} \ No newline at end of file