From 16e7e999cf3fc76ad0b8a63f6f2c842776e53be1 Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Thu, 4 May 2023 18:22:09 +0200
Subject: [PATCH] FIRE-32926 - Profile notes that are actively being edited get
 discarded when the profile owner enters or leaves the region at the same
 time.

---
 indra/newview/llpanelprofile.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index d9bc087e83..a5124c6350 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -3138,6 +3138,14 @@ void LLPanelProfileNotes::onOpen(const LLSD& key)
 
 void LLPanelProfileNotes::setNotesText(const std::string &text)
 {
+    // <FS:Zi> FIRE-32926 - Profile notes that are actively being edited get discarded when
+    //                      the profile owner enters or leaves the region at the same time.
+    if (mHasUnsavedChanges)
+    {
+        return;
+    }
+    // </FS:Zi>
+
     mSaveChanges->setEnabled(FALSE);
     mDiscardChanges->setEnabled(FALSE);
     mHasUnsavedChanges = false;