OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor cleanup

afrisby
Jeff Ames 2007-12-13 18:45:32 +00:00
parent 1cf4278862
commit 8d995a5a5d
10 changed files with 27 additions and 42 deletions
Show Stats 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> /// <summary>
/// Loads a user agent by uuid (not called directly) /// Loads a user agent by uuid (not called directly)
/// </summary> /// </summary>
/// <param name="uuid">The agents UUID</param> /// <param name="uuid">The agent's UUID</param>
/// <returns>Agent profiles</returns> /// <returns>Agent profiles</returns>
public UserAgentData getUserAgent(LLUUID uuid) public UserAgentData getUserAgent(LLUUID uuid)
{ {
@ -228,7 +228,7 @@ namespace OpenSim.Framework.UserManagement
/// <summary> /// <summary>
/// Loads a user agent by name (not called directly) /// Loads a user agent by name (not called directly)
/// </summary> /// </summary>
/// <param name="name">The agents name</param> /// <param name="name">The agent's name</param>
/// <returns>A user agent</returns> /// <returns>A user agent</returns>
public UserAgentData getUserAgent(string name) public UserAgentData getUserAgent(string name)
{ {
@ -256,12 +256,11 @@ namespace OpenSim.Framework.UserManagement
setUserProfile(profile); setUserProfile(profile);
} }
/// <summary> /// <summary>
/// Loads a user agent by name (not called directly) /// Loads a user agent by name (not called directly)
/// </summary> /// </summary>
/// <param name="fname">The agents firstname</param> /// <param name="fname">The agent's firstname</param>
/// <param name="lname">The agents lastname</param> /// <param name="lname">The agent's lastname</param>
/// <returns>A user agent</returns> /// <returns>A user agent</returns>
public UserAgentData getUserAgent(string fname, string lname) 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; return null;
} }
} }
public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{ {
List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>(); List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>();
@ -242,6 +243,7 @@ namespace OpenSim.Framework.Data.MySQL
} }
return returnlist; return returnlist;
} }
/// <summary> /// <summary>
/// Searches the database for a specified user profile by UUID /// Searches the database for a specified user profile by UUID
/// </summary> /// </summary>
@ -366,11 +368,14 @@ namespace OpenSim.Framework.Data.MySQL
// Do nothing. // 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) public bool UpdateUserProfile(UserProfileData user)
{ {
return true;
// TODO: implement // TODO: implement
return true;
} }
/// <summary> /// <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"); MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions");
ds.AcceptChanges(); ds.AcceptChanges();
return;
} }
public InventoryItemBase buildItem(DataRow row) public InventoryItemBase buildItem(DataRow row)
@ -377,7 +376,7 @@ namespace OpenSim.Framework.Data.SQLite
/// Delete all items in the specified folder /// Delete all items in the specified folder
/// </summary> /// </summary>
/// <param name="folderId">id of the folder, whose item content should be deleted</param> /// <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) private void deleteItemsInFolder(LLUUID folderId)
{ {
List<InventoryItemBase> items = getInventoryInFolder(folderId); List<InventoryItemBase> items = getInventoryInFolder(folderId);
@ -404,7 +403,6 @@ namespace OpenSim.Framework.Data.SQLite
addFolder(folder); addFolder(folder);
} }
/// <summary> /// <summary>
/// Delete a folder /// Delete a folder
/// </summary> /// </summary>

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

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

9
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -164,20 +164,13 @@ namespace OpenSim
config.Set("physics", "basicphysics"); config.Set("physics", "basicphysics");
config.Set("verbose", true); config.Set("verbose", true);
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("child_get_tasks", false); config.Set("child_get_tasks", false);
config.Set("serverside_object_permissions", false); config.Set("serverside_object_permissions", false);
config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
config.Set("startup_console_commands_file", ""); config.Set("startup_console_commands_file", "");
config.Set("shutdown_console_commands_file", ""); config.Set("shutdown_console_commands_file", "");
config.Set("script_engine", "DotNetEngine"); config.Set("script_engine", "DotNetEngine");
config.Set("asset_database", "sqlite"); config.Set("asset_database", "sqlite");
} }
if (m_config.Configs["StandAlone"] == null) if (m_config.Configs["StandAlone"] == null)
@ -201,7 +194,6 @@ namespace OpenSim
{ {
config.Set("default_location_x", 1000); config.Set("default_location_x", 1000);
config.Set("default_location_y", 1000); config.Set("default_location_y", 1000);
config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort); config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort);
config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort);
config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
@ -214,7 +206,6 @@ namespace OpenSim
config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
} }
if (m_config.Configs["RemoteAdmin"] == null) if (m_config.Configs["RemoteAdmin"] == null)
m_config.AddConfig("RemoteAdmin"); m_config.AddConfig("RemoteAdmin");
config = m_config.Configs["RemoteAdmin"]; config = m_config.Configs["RemoteAdmin"];

1
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -202,7 +202,6 @@ namespace OpenSim.Region.ClientStack
# region Client Methods # region Client Methods
public void Close() public void Close()
{ {
// Pull Client out of Region // Pull Client out of Region

1
OpenSim/Region/ClientStack/PacketServer.cs
View File

@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack
CloseClient(client); CloseClient(client);
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

4
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -128,8 +128,8 @@ namespace OpenSim.Region.ClientStack
{ {
masterAvatar = masterAvatar =
m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarLastName,
scene.RegionInfo.MasterAvatarSandboxPassword); scene.RegionInfo.MasterAvatarSandboxPassword);
} }
if (masterAvatar != null) if (masterAvatar != null)

1
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack
} }
} }
public ulong RegionHandle public ulong RegionHandle
{ {
get get

4
OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
View File

@ -67,7 +67,6 @@ namespace OpenSim.Region.Environment.Modules
} }
} }
public void Initialise(Scene scene, IConfigSource source) public void Initialise(Scene scene, IConfigSource source)
{ {
scene.RegisterModuleInterface<IAvatarFactory>(this); scene.RegisterModuleInterface<IAvatarFactory>(this);
@ -136,7 +135,6 @@ namespace OpenSim.Region.Environment.Modules
avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID; avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
} }
} }
} }
} }
} }
@ -159,7 +157,5 @@ namespace OpenSim.Region.Environment.Modules
} }
return visualParams; return visualParams;
} }
} }
} }