From 8d995a5a5dd040c227b18ac8371d89f530a52194 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 13 Dec 2007 18:45:32 +0000 Subject: [PATCH] Minor cleanup --- .../Communications/UserManagerBase.cs | 9 +++---- OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 9 +++++-- .../Data.SQLite/SQLiteInventoryStore.cs | 4 +-- .../Framework/Data.SQLite/SQLiteUserData.cs | 27 +++++++++---------- OpenSim/Region/Application/OpenSimMain.cs | 9 ------- OpenSim/Region/ClientStack/ClientView.cs | 1 - OpenSim/Region/ClientStack/PacketServer.cs | 1 - .../ClientStack/RegionApplicationBase.cs | 4 +-- OpenSim/Region/ClientStack/UDPServer.cs | 1 + .../Modules/AvatarFactoryModule.cs | 4 --- 10 files changed, 27 insertions(+), 42 deletions(-) diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index b901008af2..0e5e782c42 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 c21f89963f..e5cbe45318 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 ddc0694a5d..b9a1daada4 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 d7f4b8586f..da272776b6 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) { diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 1471f89fec..542c5cdd7a 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -164,20 +164,13 @@ namespace OpenSim config.Set("physics", "basicphysics"); config.Set("verbose", true); config.Set("physical_prim", true); - config.Set("child_get_tasks", false); - config.Set("serverside_object_permissions", false); - config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); - config.Set("startup_console_commands_file", ""); config.Set("shutdown_console_commands_file", ""); - config.Set("script_engine", "DotNetEngine"); - config.Set("asset_database", "sqlite"); - } if (m_config.Configs["StandAlone"] == null) @@ -201,7 +194,6 @@ namespace OpenSim { config.Set("default_location_x", 1000); config.Set("default_location_y", 1000); - config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort); config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); 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()); } - if (m_config.Configs["RemoteAdmin"] == null) m_config.AddConfig("RemoteAdmin"); config = m_config.Configs["RemoteAdmin"]; diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 653077f2d1..0514df54b7 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -202,7 +202,6 @@ namespace OpenSim.Region.ClientStack # region Client Methods - public void Close() { // Pull Client out of Region diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index e56a0b8919..945bb822bf 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs @@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack CloseClient(client); } - /// /// /// diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 82a5c3cc3c..fd7e04fa93 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -128,8 +128,8 @@ namespace OpenSim.Region.ClientStack { masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, - scene.RegionInfo.MasterAvatarLastName, - scene.RegionInfo.MasterAvatarSandboxPassword); + scene.RegionInfo.MasterAvatarLastName, + scene.RegionInfo.MasterAvatarSandboxPassword); } if (masterAvatar != null) diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 21e4359cdf..8095646f3a 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs @@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack } } + public ulong RegionHandle { get diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs index 86ddfaf97f..0b95aee166 100644 --- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs @@ -67,7 +67,6 @@ namespace OpenSim.Region.Environment.Modules } } - public void Initialise(Scene scene, IConfigSource source) { scene.RegisterModuleInterface(this); @@ -136,7 +135,6 @@ namespace OpenSim.Region.Environment.Modules avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID; } } - } } } @@ -159,7 +157,5 @@ namespace OpenSim.Region.Environment.Modules } return visualParams; } - - } }