From 5e99d028520966c018c24f334b84975f6d0b4e93 Mon Sep 17 00:00:00 2001 From: jef Date: Wed, 5 Dec 2007 21:30:15 +0000 Subject: [PATCH] fudge it. reverting patch for now. we might have to redo LoginParams to support either the webkey -or- the password git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1517 52acb1d6-8a22-11de-b505-999d5b087335 --- libsecondlife/Login.cs | 4 ---- .../examples/TestClient/ClientManager.cs | 2 -- libsecondlife/examples/TestClient/Program.cs | 23 ++++++------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/libsecondlife/Login.cs b/libsecondlife/Login.cs index 87a41ae7..78b0fefb 100644 --- a/libsecondlife/Login.cs +++ b/libsecondlife/Login.cs @@ -101,8 +101,6 @@ namespace libsecondlife /// public string Password; /// - public string WebLoginKey; - /// public string Start; /// public string Channel; @@ -469,7 +467,6 @@ namespace libsecondlife loginParams.first = CurrentContext.Params.FirstName; loginParams.last = CurrentContext.Params.LastName; loginParams.passwd = CurrentContext.Params.Password; - loginParams.web_login_key = CurrentContext.Params.WebLoginKey; loginParams.start = CurrentContext.Params.Start; loginParams.channel = CurrentContext.Params.Channel; loginParams.version = CurrentContext.Params.Version; @@ -793,7 +790,6 @@ namespace libsecondlife public string first; public string last; public string passwd; - public string web_login_key; public string start; public string channel; public string version; diff --git a/libsecondlife/examples/TestClient/ClientManager.cs b/libsecondlife/examples/TestClient/ClientManager.cs index f0762deb..07cea828 100644 --- a/libsecondlife/examples/TestClient/ClientManager.cs +++ b/libsecondlife/examples/TestClient/ClientManager.cs @@ -13,7 +13,6 @@ namespace libsecondlife.TestClient public string FirstName; public string LastName; public string Password; - public string WebLoginKey; public string StartLocation; public string MasterName; public LLUUID MasterKey; @@ -101,7 +100,6 @@ namespace libsecondlife.TestClient NetworkManager.LoginParams loginParams = client.Network.DefaultLoginParams( account.FirstName, account.LastName, account.Password, "TestClient", contactPerson); - loginParams.WebLoginKey = account.WebLoginKey; if (!String.IsNullOrEmpty(account.StartLocation)) loginParams.Start = account.StartLocation; diff --git a/libsecondlife/examples/TestClient/Program.cs b/libsecondlife/examples/TestClient/Program.cs index d0b9a366..d057555f 100644 --- a/libsecondlife/examples/TestClient/Program.cs +++ b/libsecondlife/examples/TestClient/Program.cs @@ -109,22 +109,13 @@ namespace libsecondlife.TestClient else if (arguments["first"] != null && arguments["last"] != null && arguments["pass"] != null) { // Taking a single login off the command-line - account = new LoginDetails(); - account.FirstName = arguments["first"]; - account.LastName = arguments["last"]; - account.Password = arguments["pass"]; - - accounts.Add(account); - } - else if (arguments["first"] != null && arguments["last"] != null && arguments["loginkey"] != null) - { - // Taking a single login off the command-line - account = new LoginDetails(); - account.FirstName = arguments["first"]; - account.LastName = arguments["last"]; - account.WebLoginKey = arguments["loginkey"]; - - accounts.Add(account); + account = new LoginDetails(); + account.FirstName = arguments["first"]; + account.LastName = arguments["last"]; + account.Password = arguments["pass"]; + + accounts.Add(account); + } else {