From 4e999756459fd390f90fa0a2a1038d2a9015d348 Mon Sep 17 00:00:00 2001 From: Cinder Roxley Date: Fri, 30 Aug 2024 11:42:48 -0500 Subject: [PATCH] Fixing AppearanceManager... --- LibreMetaverse/AppearanceManager.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/LibreMetaverse/AppearanceManager.cs b/LibreMetaverse/AppearanceManager.cs index a8ea99ac..95c58f1d 100644 --- a/LibreMetaverse/AppearanceManager.cs +++ b/LibreMetaverse/AppearanceManager.cs @@ -456,7 +456,7 @@ namespace OpenMetaverse private bool HasSentAppearanceInThisSession { get; set; } - private async void NetworkOnSimChanged(object sender, SimChangedEventArgs e) + private void NetworkOnSimChanged(object sender, SimChangedEventArgs e) { _pendingServerBake = true; @@ -2186,14 +2186,18 @@ namespace OpenMetaverse } } - Logger.Log("Passed wait for own avatar, " + maxRetries + " retries left.", Helpers.LogLevel.Info, Client); + Logger.Log($"Passed wait for own avatar, {maxRetries} retries left.", Helpers.LogLevel.Info, Client); await Client.HttpCapsClient.PostRequestAsync(cap, OSDFormat.Xml, request, cancellationToken, (response, data, error) => res = OSDParser.Deserialize(data)); if (res is OSDMap result) { - if (result["success"]) + if (result.ContainsKey("error")) + { + msg += ": " + result["error"].AsString(); + } + if (result.ContainsKey("success")) { /* Sample Reply: { @@ -2316,11 +2320,6 @@ namespace OpenMetaverse await Task.Delay(REBAKE_DELAY); return await UpdateAvatarAppearanceAsync(cancellationToken, totalRetries - 1); } - - if (result.ContainsKey("error")) - { - msg += ": " + result["error"].AsString(); - } } Logger.Log(msg, Helpers.LogLevel.Error, Client); @@ -2773,7 +2772,7 @@ namespace OpenMetaverse _ = UpdateAvatarAppearanceAsync(CancellationToken.None); - if(ReattachAttachmentsWhenMovingSimulator || !HasSentAppearanceInThisSession) + if(!HasSentAppearanceInThisSession) { HasSentAppearanceInThisSession = true; ThreadPool.QueueUserWorkItem((o) => { SendOutfitToCurrentSimulator(); });