diff options
Diffstat (limited to 'OpenSim/Framework')
4 files changed, 24 insertions, 25 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index b901008..0e5e782 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.UserManagement | |||
206 | /// <summary> | 206 | /// <summary> |
207 | /// Loads a user agent by uuid (not called directly) | 207 | /// Loads a user agent by uuid (not called directly) |
208 | /// </summary> | 208 | /// </summary> |
209 | /// <param name="uuid">The agents UUID</param> | 209 | /// <param name="uuid">The agent's UUID</param> |
210 | /// <returns>Agent profiles</returns> | 210 | /// <returns>Agent profiles</returns> |
211 | public UserAgentData getUserAgent(LLUUID uuid) | 211 | public UserAgentData getUserAgent(LLUUID uuid) |
212 | { | 212 | { |
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.UserManagement | |||
228 | /// <summary> | 228 | /// <summary> |
229 | /// Loads a user agent by name (not called directly) | 229 | /// Loads a user agent by name (not called directly) |
230 | /// </summary> | 230 | /// </summary> |
231 | /// <param name="name">The agents name</param> | 231 | /// <param name="name">The agent's name</param> |
232 | /// <returns>A user agent</returns> | 232 | /// <returns>A user agent</returns> |
233 | public UserAgentData getUserAgent(string name) | 233 | public UserAgentData getUserAgent(string name) |
234 | { | 234 | { |
@@ -256,12 +256,11 @@ namespace OpenSim.Framework.UserManagement | |||
256 | setUserProfile(profile); | 256 | setUserProfile(profile); |
257 | } | 257 | } |
258 | 258 | ||
259 | |||
260 | /// <summary> | 259 | /// <summary> |
261 | /// Loads a user agent by name (not called directly) | 260 | /// Loads a user agent by name (not called directly) |
262 | /// </summary> | 261 | /// </summary> |
263 | /// <param name="fname">The agents firstname</param> | 262 | /// <param name="fname">The agent's firstname</param> |
264 | /// <param name="lname">The agents lastname</param> | 263 | /// <param name="lname">The agent's lastname</param> |
265 | /// <returns>A user agent</returns> | 264 | /// <returns>A user agent</returns> |
266 | public UserAgentData getUserAgent(string fname, string lname) | 265 | public UserAgentData getUserAgent(string fname, string lname) |
267 | { | 266 | { |
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs index c21f899..e5cbe45 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs | |||
@@ -158,6 +158,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
158 | return null; | 158 | return null; |
159 | } | 159 | } |
160 | } | 160 | } |
161 | |||
161 | public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) | 162 | public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) |
162 | { | 163 | { |
163 | List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>(); | 164 | List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>(); |
@@ -242,6 +243,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
242 | } | 243 | } |
243 | return returnlist; | 244 | return returnlist; |
244 | } | 245 | } |
246 | |||
245 | /// <summary> | 247 | /// <summary> |
246 | /// Searches the database for a specified user profile by UUID | 248 | /// Searches the database for a specified user profile by UUID |
247 | /// </summary> | 249 | /// </summary> |
@@ -366,11 +368,14 @@ namespace OpenSim.Framework.Data.MySQL | |||
366 | // Do nothing. | 368 | // Do nothing. |
367 | } | 369 | } |
368 | 370 | ||
369 | 371 | /// <summary> | |
372 | /// Updates a user profile stored in the DB | ||
373 | /// </summary> | ||
374 | /// <param name="user">The profile data to use to update the DB</param> | ||
370 | public bool UpdateUserProfile(UserProfileData user) | 375 | public bool UpdateUserProfile(UserProfileData user) |
371 | { | 376 | { |
372 | return true; | ||
373 | // TODO: implement | 377 | // TODO: implement |
378 | return true; | ||
374 | } | 379 | } |
375 | 380 | ||
376 | /// <summary> | 381 | /// <summary> |
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs index ddc0694..b9a1daa 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs | |||
@@ -82,7 +82,6 @@ namespace OpenSim.Framework.Data.SQLite | |||
82 | MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions"); | 82 | MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions"); |
83 | 83 | ||
84 | ds.AcceptChanges(); | 84 | ds.AcceptChanges(); |
85 | return; | ||
86 | } | 85 | } |
87 | 86 | ||
88 | public InventoryItemBase buildItem(DataRow row) | 87 | public InventoryItemBase buildItem(DataRow row) |
@@ -377,7 +376,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
377 | /// Delete all items in the specified folder | 376 | /// Delete all items in the specified folder |
378 | /// </summary> | 377 | /// </summary> |
379 | /// <param name="folderId">id of the folder, whose item content should be deleted</param> | 378 | /// <param name="folderId">id of the folder, whose item content should be deleted</param> |
380 | //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementatio | 379 | //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementation |
381 | private void deleteItemsInFolder(LLUUID folderId) | 380 | private void deleteItemsInFolder(LLUUID folderId) |
382 | { | 381 | { |
383 | List<InventoryItemBase> items = getInventoryInFolder(folderId); | 382 | List<InventoryItemBase> items = getInventoryInFolder(folderId); |
@@ -404,7 +403,6 @@ namespace OpenSim.Framework.Data.SQLite | |||
404 | addFolder(folder); | 403 | addFolder(folder); |
405 | } | 404 | } |
406 | 405 | ||
407 | |||
408 | /// <summary> | 406 | /// <summary> |
409 | /// Delete a folder | 407 | /// Delete a folder |
410 | /// </summary> | 408 | /// </summary> |
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs index d7f4b85..da27277 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | |||
@@ -33,14 +33,11 @@ using Mono.Data.SqliteClient; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
35 | 35 | ||
36 | |||
37 | namespace OpenSim.Framework.Data.SQLite | 36 | namespace OpenSim.Framework.Data.SQLite |
38 | { | 37 | { |
39 | /// <summary> | 38 | /// <summary> |
40 | /// A User storage interface for the DB4o database system | 39 | /// A User storage interface for the SQLite database system |
41 | /// </summary> | 40 | /// </summary> |
42 | /// | ||
43 | |||
44 | 41 | ||
45 | public class SQLiteUserData : SQLiteBase, IUserData | 42 | public class SQLiteUserData : SQLiteBase, IUserData |
46 | { | 43 | { |
@@ -78,7 +75,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
78 | /// <summary> | 75 | /// <summary> |
79 | /// Loads a specified user profile from a UUID | 76 | /// Loads a specified user profile from a UUID |
80 | /// </summary> | 77 | /// </summary> |
81 | /// <param name="uuid">The users UUID</param> | 78 | /// <param name="uuid">The user's UUID</param> |
82 | /// <returns>A user profile</returns> | 79 | /// <returns>A user profile</returns> |
83 | public UserProfileData GetUserByUUID(LLUUID uuid) | 80 | public UserProfileData GetUserByUUID(LLUUID uuid) |
84 | { | 81 | { |
@@ -105,8 +102,8 @@ namespace OpenSim.Framework.Data.SQLite | |||
105 | /// <summary> | 102 | /// <summary> |
106 | /// Returns a user by searching for its name | 103 | /// Returns a user by searching for its name |
107 | /// </summary> | 104 | /// </summary> |
108 | /// <param name="name">The users account name</param> | 105 | /// <param name="name">The user's account name</param> |
109 | /// <returns>A matching users profile</returns> | 106 | /// <returns>A matching user profile</returns> |
110 | public UserProfileData GetUserByName(string name) | 107 | public UserProfileData GetUserByName(string name) |
111 | { | 108 | { |
112 | return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]); | 109 | return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]); |
@@ -115,9 +112,9 @@ namespace OpenSim.Framework.Data.SQLite | |||
115 | /// <summary> | 112 | /// <summary> |
116 | /// Returns a user by searching for its name | 113 | /// Returns a user by searching for its name |
117 | /// </summary> | 114 | /// </summary> |
118 | /// <param name="fname">The first part of the users account name</param> | 115 | /// <param name="fname">The first part of the user's account name</param> |
119 | /// <param name="lname">The second part of the users account name</param> | 116 | /// <param name="lname">The second part of the user's account name</param> |
120 | /// <returns>A matching users profile</returns> | 117 | /// <returns>A matching user profile</returns> |
121 | public UserProfileData GetUserByName(string fname, string lname) | 118 | public UserProfileData GetUserByName(string fname, string lname) |
122 | { | 119 | { |
123 | string select = "surname = '" + lname + "' and username = '" + fname + "'"; | 120 | string select = "surname = '" + lname + "' and username = '" + fname + "'"; |
@@ -191,8 +188,8 @@ namespace OpenSim.Framework.Data.SQLite | |||
191 | /// <summary> | 188 | /// <summary> |
192 | /// Returns a user by UUID direct | 189 | /// Returns a user by UUID direct |
193 | /// </summary> | 190 | /// </summary> |
194 | /// <param name="uuid">The users account ID</param> | 191 | /// <param name="uuid">The user's account ID</param> |
195 | /// <returns>A matching users profile</returns> | 192 | /// <returns>A matching user profile</returns> |
196 | public UserAgentData GetAgentByUUID(LLUUID uuid) | 193 | public UserAgentData GetAgentByUUID(LLUUID uuid) |
197 | { | 194 | { |
198 | try | 195 | try |
@@ -209,7 +206,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
209 | /// Returns a session by account name | 206 | /// Returns a session by account name |
210 | /// </summary> | 207 | /// </summary> |
211 | /// <param name="name">The account name</param> | 208 | /// <param name="name">The account name</param> |
212 | /// <returns>The users session agent</returns> | 209 | /// <returns>The user's session agent</returns> |
213 | public UserAgentData GetAgentByName(string name) | 210 | public UserAgentData GetAgentByName(string name) |
214 | { | 211 | { |
215 | return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]); | 212 | return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]); |
@@ -218,8 +215,8 @@ namespace OpenSim.Framework.Data.SQLite | |||
218 | /// <summary> | 215 | /// <summary> |
219 | /// Returns a session by account name | 216 | /// Returns a session by account name |
220 | /// </summary> | 217 | /// </summary> |
221 | /// <param name="fname">The first part of the users account name</param> | 218 | /// <param name="fname">The first part of the user's account name</param> |
222 | /// <param name="lname">The second part of the users account name</param> | 219 | /// <param name="lname">The second part of the user's account name</param> |
223 | /// <returns>A user agent</returns> | 220 | /// <returns>A user agent</returns> |
224 | public UserAgentData GetAgentByName(string fname, string lname) | 221 | public UserAgentData GetAgentByName(string fname, string lname) |
225 | { | 222 | { |