From eabfde13f37decd84c470b943afd33797e6977c8 Mon Sep 17 00:00:00 2001 From: baned Date: Fri, 27 Apr 2007 01:00:09 +0000 Subject: [PATCH] * Fixed all the obsolete warnings in the rest of the projects for the login changes. git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1151 52acb1d6-8a22-11de-b505-999d5b087335 --- libsecondlife/examples/Heightmap/frmHeightmap.cs | 2 +- libsecondlife/examples/IA_ImageTool/ImageTool.cs | 2 +- .../examples/IA_NotecardTool/NotecardTool.cs | 2 +- .../IA_SimpleInventory/IA_SimpleInventory.cs | 2 +- libsecondlife/examples/Key2Name/key2name.cs | 2 +- libsecondlife/examples/TestClient/ClientManager.cs | 2 +- .../examples/TestClient/Commands/LoginCommand.cs | 2 +- .../examples/groupmanager/frmGroupManager.cs | 2 +- libsecondlife/examples/name2key/name2key.cs | 2 +- libsecondlife/examples/primexport/frmPrimExport.cs | 2 +- .../examples/slaccountant/frmSLAccountant.cs | 2 +- libsecondlife/examples/sldump/sldump.cs | 9 ++++----- libsecondlife/libsecondlife.Utilities/Utilities.cs | 14 +++++++------- 13 files changed, 22 insertions(+), 23 deletions(-) diff --git a/libsecondlife/examples/Heightmap/frmHeightmap.cs b/libsecondlife/examples/Heightmap/frmHeightmap.cs index 55d96cb0..87090963 100644 --- a/libsecondlife/examples/Heightmap/frmHeightmap.cs +++ b/libsecondlife/examples/Heightmap/frmHeightmap.cs @@ -66,7 +66,7 @@ namespace Heightmap if (!Client.Network.Login(FirstName, LastName, Password, "Heightmap", "jhurliman@wsu.edu")) { - Console.WriteLine("Login failed: " + Client.Network.LoginMessage); + Console.WriteLine("Login failed: " + Client.Network.LoginStatusMessage); Console.ReadKey(); this.Close(); return; diff --git a/libsecondlife/examples/IA_ImageTool/ImageTool.cs b/libsecondlife/examples/IA_ImageTool/ImageTool.cs index e4934f1e..b4cdac96 100644 --- a/libsecondlife/examples/IA_ImageTool/ImageTool.cs +++ b/libsecondlife/examples/IA_ImageTool/ImageTool.cs @@ -132,7 +132,7 @@ namespace IA_ImageTool if (!_Client.Network.Login(FirstName, LastName, Password, "ImageTool", "static.sprocket@gmail.com")) { // Login failed - Console.WriteLine("Error logging in: " + _Client.Network.LoginMessage); + Console.WriteLine("Error logging in: " + _Client.Network.LoginStatusMessage); return false; } diff --git a/libsecondlife/examples/IA_NotecardTool/NotecardTool.cs b/libsecondlife/examples/IA_NotecardTool/NotecardTool.cs index 46faff2c..c43a7695 100644 --- a/libsecondlife/examples/IA_NotecardTool/NotecardTool.cs +++ b/libsecondlife/examples/IA_NotecardTool/NotecardTool.cs @@ -118,7 +118,7 @@ namespace IA_NotecardTool if (!_Client.Network.Login(FirstName, LastName, Password, "createnotecard", "static.sprocket@gmail.com")) { // Login failed - Console.WriteLine("Error logging in: " + _Client.Network.LoginMessage); + Console.WriteLine("Error logging in: " + _Client.Network.LoginStatusMessage); return false; } diff --git a/libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.cs b/libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.cs index cce63417..a1c3e1ab 100644 --- a/libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.cs +++ b/libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.cs @@ -93,7 +93,7 @@ namespace IA_SimpleInventory if (!client.Network.Login(FirstName, LastName, Password, "IA_SimpleInventory", "static.sprocket@gmail.com")) { // Login failed - Console.WriteLine("Error logging in: " + client.Network.LoginMessage); + Console.WriteLine("Error logging in: " + client.Network.LoginStatusMessage); return false; } diff --git a/libsecondlife/examples/Key2Name/key2name.cs b/libsecondlife/examples/Key2Name/key2name.cs index d63a195e..b63b0634 100644 --- a/libsecondlife/examples/Key2Name/key2name.cs +++ b/libsecondlife/examples/Key2Name/key2name.cs @@ -21,7 +21,7 @@ namespace Key2Name if (!client.Network.Login(args[0], args[1], args[2], "key2name", "jessemalthus@gmail.com")) { // Login failed - Console.WriteLine("Error logging in: " + client.Network.LoginMessage); + Console.WriteLine("Error logging in: " + client.Network.LoginStatusMessage); return; } diff --git a/libsecondlife/examples/TestClient/ClientManager.cs b/libsecondlife/examples/TestClient/ClientManager.cs index 011b89c4..aaa59430 100644 --- a/libsecondlife/examples/TestClient/ClientManager.cs +++ b/libsecondlife/examples/TestClient/ClientManager.cs @@ -119,7 +119,7 @@ namespace libsecondlife.TestClient contactPerson)) { Console.WriteLine("Failed to login " + account.FirstName + " " + account.LastName + ": " + - client.Network.LoginMessage); + client.Network.LoginStatusMessage); } } diff --git a/libsecondlife/examples/TestClient/Commands/LoginCommand.cs b/libsecondlife/examples/TestClient/Commands/LoginCommand.cs index c0430ba4..a68b8856 100644 --- a/libsecondlife/examples/TestClient/Commands/LoginCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/LoginCommand.cs @@ -27,7 +27,7 @@ namespace libsecondlife.TestClient } else { - return "Failed to login: " + newClient.Network.LoginMessage; + return "Failed to login: " + newClient.Network.LoginStatusMessage; } } } diff --git a/libsecondlife/examples/groupmanager/frmGroupManager.cs b/libsecondlife/examples/groupmanager/frmGroupManager.cs index f9a0a240..f5a112fa 100644 --- a/libsecondlife/examples/groupmanager/frmGroupManager.cs +++ b/libsecondlife/examples/groupmanager/frmGroupManager.cs @@ -75,7 +75,7 @@ namespace groupmanager } else { - MessageBox.Show(this, "Error logging in: " + Client.Network.LoginMessage); + MessageBox.Show(this, "Error logging in: " + Client.Network.LoginStatusMessage); cmdConnect.Text = "Connect"; txtFirstName.Enabled = txtLastName.Enabled = txtPassword.Enabled = true; groupBox.Enabled = false; diff --git a/libsecondlife/examples/name2key/name2key.cs b/libsecondlife/examples/name2key/name2key.cs index 675238f6..d073b0a4 100644 --- a/libsecondlife/examples/name2key/name2key.cs +++ b/libsecondlife/examples/name2key/name2key.cs @@ -81,7 +81,7 @@ namespace name2key if (!client.Network.Login(args[0], args[1], args[2], "name2key", "jhurliman@wsu.edu")) { // Login failed - Console.WriteLine("ERROR: " + client.Network.LoginMessage); + Console.WriteLine("ERROR: " + client.Network.LoginStatusMessage); return; } diff --git a/libsecondlife/examples/primexport/frmPrimExport.cs b/libsecondlife/examples/primexport/frmPrimExport.cs index 6af868bb..3b62eafb 100644 --- a/libsecondlife/examples/primexport/frmPrimExport.cs +++ b/libsecondlife/examples/primexport/frmPrimExport.cs @@ -589,7 +589,7 @@ namespace primexport } else { - MessageBox.Show(this, "Error logging in: " + client.Network.LoginMessage); + MessageBox.Show(this, "Error logging in: " + client.Network.LoginStatusMessage); cmdConnect.Text = "Connect"; txtFirstName.Enabled = txtLastName.Enabled = txtPassword.Enabled = true; } diff --git a/libsecondlife/examples/slaccountant/frmSLAccountant.cs b/libsecondlife/examples/slaccountant/frmSLAccountant.cs index 18a2a2a9..860a4f4e 100644 --- a/libsecondlife/examples/slaccountant/frmSLAccountant.cs +++ b/libsecondlife/examples/slaccountant/frmSLAccountant.cs @@ -440,7 +440,7 @@ namespace SLAccountant } else { - MessageBox.Show(this, "Error logging in: " + client.Network.LoginMessage); + MessageBox.Show(this, "Error logging in: " + client.Network.LoginStatusMessage); cmdConnect.Text = "Connect"; txtFirstName.Enabled = txtLastName.Enabled = txtPassword.Enabled = true; txtFind.Enabled = cmdFind.Enabled = false; diff --git a/libsecondlife/examples/sldump/sldump.cs b/libsecondlife/examples/sldump/sldump.cs index ee756622..dfd2ad1a 100644 --- a/libsecondlife/examples/sldump/sldump.cs +++ b/libsecondlife/examples/sldump/sldump.cs @@ -124,12 +124,11 @@ namespace sldump if (!LoginSuccess) { - Console.WriteLine("Login failed ({0}): {1}", client.Network.LoginErrorKey, - client.Network.LoginMessage); + Console.WriteLine("Login failed: {0}", client.Network.LoginStatusMessage); return; } - Console.WriteLine("Message of the day: " + client.Network.LoginMessage); + Console.WriteLine("Message of the day: " + client.Network.MOTD); int start = Environment.TickCount; int milliseconds = Int32.Parse(args[3]) * 1000; @@ -148,9 +147,9 @@ namespace sldump client.Network.Logout(); } - static void Network_OnLogin(NetworkManager.LoginStatus login) + static void Network_OnLogin(NetworkManager.LoginStatus login, string message) { - Console.WriteLine("Login: " + login.ToString()); + Console.WriteLine("Login: " + login.ToString() + " (" + message + ")"); switch (login) { diff --git a/libsecondlife/libsecondlife.Utilities/Utilities.cs b/libsecondlife/libsecondlife.Utilities/Utilities.cs index 08d2e6f2..e24bb534 100644 --- a/libsecondlife/libsecondlife.Utilities/Utilities.cs +++ b/libsecondlife/libsecondlife.Utilities/Utilities.cs @@ -120,29 +120,29 @@ namespace libsecondlife.Utilities } else { - if (client.Network.LoginErrorKey == "god") + if (client.Network.LoginStatusMessage == "god") { client.Log("Grid is down, waiting 10 minutes", Helpers.LogLevel.Warning); LoginWait(10); goto Start; } - else if (client.Network.LoginErrorKey == "key") + else if (client.Network.LoginStatusMessage == "key") { client.Log("Bad username or password, giving up on login", Helpers.LogLevel.Error); return false; } - else if (client.Network.LoginErrorKey == "presence") + else if (client.Network.LoginStatusMessage == "presence") { client.Log("Server is still logging us out, waiting 1 minute", Helpers.LogLevel.Warning); LoginWait(1); goto Start; } - else if (client.Network.LoginErrorKey == "disabled") + else if (client.Network.LoginStatusMessage == "disabled") { client.Log("This account has been banned! Giving up on login", Helpers.LogLevel.Error); return false; } - else if (client.Network.LoginErrorKey == "timed out") + else if (client.Network.LoginStatusMessage == "timed out") { client.Log("Login request timed out, waiting 1 minute", Helpers.LogLevel.Warning); LoginWait(1); @@ -154,8 +154,8 @@ namespace libsecondlife.Utilities if (unknownLogins < 5) { - client.Log("Unknown login error, waiting 2 minutes: " + client.Network.LoginErrorKey + ": " + - client.Network.LoginMessage, Helpers.LogLevel.Warning); + client.Log("Unknown login error, waiting 2 minutes: " + client.Network.LoginStatusMessage, + Helpers.LogLevel.Warning); LoginWait(2); goto Start; }