From 7302a732c1e421c9fc08aee7a9572dcd195f8e34 Mon Sep 17 00:00:00 2001 From: Madpeter Date: Sat, 25 Apr 2020 23:04:05 +0100 Subject: [PATCH] makes the multi link support update faster and does some basic checks --- CLI/CliExitOnLogout.cs | 2 +- CLI/HttpCnC.cs | 2 +- Core/bottypes/EventsBot.cs | 6 ++-- .../Libremetaverse/AppearanceManager.cs | 36 +++++++++++++------ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/CLI/CliExitOnLogout.cs b/CLI/CliExitOnLogout.cs index 4094e04..a2ae151 100644 --- a/CLI/CliExitOnLogout.cs +++ b/CLI/CliExitOnLogout.cs @@ -36,7 +36,7 @@ namespace BetterSecondBot Bot.LastStatusMessage = NewStatusMessage; ConsoleLog.Status(Bot.LastStatusMessage); } - Thread.Sleep(5000); + Thread.Sleep(1000); } Bot.GetClient.Network.Logout(); } diff --git a/CLI/HttpCnC.cs b/CLI/HttpCnC.cs index ede90fc..d964619 100644 --- a/CLI/HttpCnC.cs +++ b/CLI/HttpCnC.cs @@ -27,7 +27,7 @@ namespace BetterSecondBot last_cnc_status = NewStatusMessage; ConsoleLog.Status(last_cnc_status); } - Thread.Sleep(5000); + Thread.Sleep(1000); } ConsoleLog.Status("Shutting down now"); if (my_http_server.GetBot != null) diff --git a/Core/bottypes/EventsBot.cs b/Core/bottypes/EventsBot.cs index 607ba31..e7f36bc 100644 --- a/Core/bottypes/EventsBot.cs +++ b/Core/bottypes/EventsBot.cs @@ -24,7 +24,7 @@ namespace BSB.bottypes { if (delay_appearence_update == 0) { - delay_appearence_update = helpers.UnixTimeNow() + 5; + delay_appearence_update = helpers.UnixTimeNow(); } else if (delay_appearence_update > 0) { @@ -34,7 +34,7 @@ namespace BSB.bottypes delay_appearence_update = -1; if(Client.Appearance.RequestSetAppearance() == "retry") { - delay_appearence_update = helpers.UnixTimeNow() + 5; + delay_appearence_update = helpers.UnixTimeNow() + 1; } } } @@ -42,7 +42,7 @@ namespace BSB.bottypes } } } - return "Rendering: "+ delay_appearence_update.ToString()+" "+base.GetStatus(); + return base.GetStatus(); } protected override void AfterBotLoginHandler() diff --git a/libremetaverse-core/Libremetaverse/AppearanceManager.cs b/libremetaverse-core/Libremetaverse/AppearanceManager.cs index 9d3aad8..55bda8d 100644 --- a/libremetaverse-core/Libremetaverse/AppearanceManager.cs +++ b/libremetaverse-core/Libremetaverse/AppearanceManager.cs @@ -459,29 +459,43 @@ namespace OpenMetaverse { try { - KeyValuePair> reply = Client.Inventory.FolderContents_replyed(GetCOF().UUID, Client.Self.AgentID, true, true, InventorySortOrder.ByDate, 40 * 1000, false); - if (reply.Key == "ok") + if (Client != null) { - List contents = reply.Value; - List wareables = new List(); - if (contents != null) + if (Client.Self != null) { - foreach (InventoryBase item in contents) + if (Client.Self.AgentID != null) { - if ((item is InventoryWearable) || (item is InventoryObject)) + InventoryFolder cof = GetCOF(); + if (cof != null) { - wareables.Add((InventoryItem)item); + KeyValuePair> reply = Client.Inventory.FolderContents_replyed(cof.UUID, Client.Self.AgentID, true, true, InventorySortOrder.ByDate, 40 * 1000, false); + if (reply.Key == "ok") + { + List contents = reply.Value; + List wareables = new List(); + if (contents != null) + { + foreach (InventoryBase item in contents) + { + if ((item is InventoryWearable) || (item is InventoryObject)) + { + wareables.Add((InventoryItem)item); + } + } + Client.Appearance.ReplaceOutfit(wareables, false); + } + } + return reply.Key; } } - Client.Appearance.ReplaceOutfit(wareables, false); } } - return reply.Key; } catch { - return "fail"; + } + return "retry"; } ///