ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Jeff Ames
2007-12-13 18:45:32 +00:00
parent 1cf4278862
commit 8d995a5a5d
10 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -206,7 +206,7 @@ namespace OpenSim.Framework.UserManagement
/// <summary>
/// Loads a user agent by uuid (not called directly)
/// </summary>
/// <param name="uuid">The agents UUID</param>
/// <param name="uuid">The agent's UUID</param>
/// <returns>Agent profiles</returns>
public UserAgentData getUserAgent(LLUUID uuid)
{
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.UserManagement
/// <summary>
/// Loads a user agent by name (not called directly)
/// </summary>
/// <param name="name">The agents name</param>
/// <param name="name">The agent's name</param>
/// <returns>A user agent</returns>
public UserAgentData getUserAgent(string name)
{
@@ -256,12 +256,11 @@ namespace OpenSim.Framework.UserManagement
setUserProfile(profile);
}
/// <summary>
/// Loads a user agent by name (not called directly)
/// </summary>
/// <param name="fname">The agents firstname</param>
/// <param name="lname">The agents lastname</param>
/// <param name="fname">The agent's firstname</param>
/// <param name="lname">The agent's lastname</param>
/// <returns>A user agent</returns>
public UserAgentData getUserAgent(string fname, string lname)
{

9
OpenSim/Framework/Data.MySQL/MySQLUserData.cs
View File

@@ -158,6 +158,7 @@ namespace OpenSim.Framework.Data.MySQL
return null;
}
}
public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{
List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>();
@@ -242,6 +243,7 @@ namespace OpenSim.Framework.Data.MySQL
}
return returnlist;
}
/// <summary>
/// Searches the database for a specified user profile by UUID
/// </summary>
@@ -366,11 +368,14 @@ namespace OpenSim.Framework.Data.MySQL
// Do nothing.
}
/// <summary>
/// Updates a user profile stored in the DB
/// </summary>
/// <param name="user">The profile data to use to update the DB</param>
public bool UpdateUserProfile(UserProfileData user)
{
return true;
// TODO: implement
return true;
}
/// <summary>

4
OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
View File

@@ -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
/// </summary>
/// <param name="folderId">id of the folder, whose item content should be deleted</param>
//!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<InventoryItemBase> items = getInventoryInFolder(folderId);
@@ -404,7 +403,6 @@ namespace OpenSim.Framework.Data.SQLite
addFolder(folder);
}
/// <summary>
/// Delete a folder
/// </summary>

27
OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
View File

@@ -33,14 +33,11 @@ using Mono.Data.SqliteClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Data.SQLite
{
/// <summary>
/// A User storage interface for the DB4o database system
/// A User storage interface for the SQLite database system
/// </summary>
///
public class SQLiteUserData : SQLiteBase, IUserData
{
@@ -78,7 +75,7 @@ namespace OpenSim.Framework.Data.SQLite
/// <summary>
/// Loads a specified user profile from a UUID
/// </summary>
/// <param name="uuid">The users UUID</param>
/// <param name="uuid">The user's UUID</param>
/// <returns>A user profile</returns>
public UserProfileData GetUserByUUID(LLUUID uuid)
{
@@ -105,8 +102,8 @@ namespace OpenSim.Framework.Data.SQLite
/// <summary>
/// Returns a user by searching for its name
/// </summary>
/// <param name="name">The users account name</param>
/// <returns>A matching users profile</returns>
/// <param name="name">The user's account name</param>
/// <returns>A matching user profile</returns>
public UserProfileData GetUserByName(string name)
{
return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -115,9 +112,9 @@ namespace OpenSim.Framework.Data.SQLite
/// <summary>
/// Returns a user by searching for its name
/// </summary>
/// <param name="fname">The first part of the users account name</param>
/// <param name="lname">The second part of the users account name</param>
/// <returns>A matching users profile</returns>
/// <param name="fname">The first part of the user's account name</param>
/// <param name="lname">The second part of the user's account name</param>
/// <returns>A matching user profile</returns>
public UserProfileData GetUserByName(string fname, string lname)
{
string select = "surname = '" + lname + "' and username = '" + fname + "'";
@@ -191,8 +188,8 @@ namespace OpenSim.Framework.Data.SQLite
/// <summary>
/// Returns a user by UUID direct
/// </summary>
/// <param name="uuid">The users account ID</param>
/// <returns>A matching users profile</returns>
/// <param name="uuid">The user's account ID</param>
/// <returns>A matching user profile</returns>
public UserAgentData GetAgentByUUID(LLUUID uuid)
{
try
@@ -209,7 +206,7 @@ namespace OpenSim.Framework.Data.SQLite
/// Returns a session by account name
/// </summary>
/// <param name="name">The account name</param>
/// <returns>The users session agent</returns>
/// <returns>The user's session agent</returns>
public UserAgentData GetAgentByName(string name)
{
return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -218,8 +215,8 @@ namespace OpenSim.Framework.Data.SQLite
/// <summary>
/// Returns a session by account name
/// </summary>
/// <param name="fname">The first part of the users account name</param>
/// <param name="lname">The second part of the users account name</param>
/// <param name="fname">The first part of the user's account name</param>
/// <param name="lname">The second part of the user's account name</param>
/// <returns>A user agent</returns>
public UserAgentData GetAgentByName(string fname, string lname)
{