From 8d995a5a5dd040c227b18ac8371d89f530a52194 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 13 Dec 2007 18:45:32 +0000
Subject: Minor cleanup
---
.../Framework/Communications/UserManagerBase.cs | 9 ++++----
OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 9 ++++++--
.../Framework/Data.SQLite/SQLiteInventoryStore.cs | 4 +---
OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | 27 ++++++++++------------
4 files changed, 24 insertions(+), 25 deletions(-)
(limited to 'OpenSim/Framework')
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
///
/// Loads a user agent by uuid (not called directly)
///
- /// The agents UUID
+ /// The agent's UUID
/// Agent profiles
public UserAgentData getUserAgent(LLUUID uuid)
{
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.UserManagement
///
/// Loads a user agent by name (not called directly)
///
- /// The agents name
+ /// The agent's name
/// A user agent
public UserAgentData getUserAgent(string name)
{
@@ -256,12 +256,11 @@ namespace OpenSim.Framework.UserManagement
setUserProfile(profile);
}
-
///
/// Loads a user agent by name (not called directly)
///
- /// The agents firstname
- /// The agents lastname
+ /// The agent's firstname
+ /// The agent's lastname
/// A user agent
public UserAgentData getUserAgent(string fname, string lname)
{
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
return null;
}
}
+
public List GeneratePickerResults(LLUUID queryID, string query)
{
List returnlist = new List();
@@ -242,6 +243,7 @@ namespace OpenSim.Framework.Data.MySQL
}
return returnlist;
}
+
///
/// Searches the database for a specified user profile by UUID
///
@@ -366,11 +368,14 @@ namespace OpenSim.Framework.Data.MySQL
// Do nothing.
}
-
+ ///
+ /// Updates a user profile stored in the DB
+ ///
+ /// The profile data to use to update the DB
public bool UpdateUserProfile(UserProfileData user)
{
- return true;
// TODO: implement
+ return true;
}
///
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
MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions");
ds.AcceptChanges();
- return;
}
public InventoryItemBase buildItem(DataRow row)
@@ -377,7 +376,7 @@ namespace OpenSim.Framework.Data.SQLite
/// Delete all items in the specified folder
///
/// id of the folder, whose item content should be deleted
- //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementatio
+ //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementation
private void deleteItemsInFolder(LLUUID folderId)
{
List items = getInventoryInFolder(folderId);
@@ -404,7 +403,6 @@ namespace OpenSim.Framework.Data.SQLite
addFolder(folder);
}
-
///
/// Delete a folder
///
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;
using OpenSim.Framework;
using OpenSim.Framework.Console;
-
namespace OpenSim.Framework.Data.SQLite
{
///
- /// A User storage interface for the DB4o database system
+ /// A User storage interface for the SQLite database system
///
- ///
-
public class SQLiteUserData : SQLiteBase, IUserData
{
@@ -78,7 +75,7 @@ namespace OpenSim.Framework.Data.SQLite
///
/// Loads a specified user profile from a UUID
///
- /// The users UUID
+ /// The user's UUID
/// A user profile
public UserProfileData GetUserByUUID(LLUUID uuid)
{
@@ -105,8 +102,8 @@ namespace OpenSim.Framework.Data.SQLite
///
/// Returns a user by searching for its name
///
- /// The users account name
- /// A matching users profile
+ /// The user's account name
+ /// A matching user profile
public UserProfileData GetUserByName(string name)
{
return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -115,9 +112,9 @@ namespace OpenSim.Framework.Data.SQLite
///
/// Returns a user by searching for its name
///
- /// The first part of the users account name
- /// The second part of the users account name
- /// A matching users profile
+ /// The first part of the user's account name
+ /// The second part of the user's account name
+ /// A matching user profile
public UserProfileData GetUserByName(string fname, string lname)
{
string select = "surname = '" + lname + "' and username = '" + fname + "'";
@@ -191,8 +188,8 @@ namespace OpenSim.Framework.Data.SQLite
///
/// Returns a user by UUID direct
///
- /// The users account ID
- /// A matching users profile
+ /// The user's account ID
+ /// A matching user profile
public UserAgentData GetAgentByUUID(LLUUID uuid)
{
try
@@ -209,7 +206,7 @@ namespace OpenSim.Framework.Data.SQLite
/// Returns a session by account name
///
/// The account name
- /// The users session agent
+ /// The user's session agent
public UserAgentData GetAgentByName(string name)
{
return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -218,8 +215,8 @@ namespace OpenSim.Framework.Data.SQLite
///
/// Returns a session by account name
///
- /// The first part of the users account name
- /// The second part of the users account name
+ /// The first part of the user's account name
+ /// The second part of the user's account name
/// A user agent
public UserAgentData GetAgentByName(string fname, string lname)
{
--
cgit v1.1