From fdeb194d0ebdc9e0f525ef03b53721e2dda32e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Fri, 11 Oct 2019 05:33:54 -0400
Subject: [PATCH] Fix Creator and Last Owner not showing in edit tools

Also fix special cases where there are owners that are not a single user
---
 indra/newview/llpanelpermissions.cpp | 45 +++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 637f72750..fa040727d 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -391,23 +391,46 @@ void LLPanelPermissions::refresh()
 	getChildView("Last Owner:")->setEnabled(TRUE);
 
 	std::string owner_app_link;
+	if (auto view = getChild<LLTextBox>("Creator Name"))
+	{
+		if (LLSelectMgr::getInstance()->selectGetCreator(mCreatorID, owner_app_link))
+		{
+			view->setValue(mCreatorID);
+		}
+		else
+		{
+			view->setValue(LLUUID::null);
+			view->setText(owner_app_link);
+		}
+		view->setEnabled(true);
+	}
+
 	const BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_app_link);
-
-	if (auto view = getChildView("Creator Name"))
+	if (auto view = getChild<LLTextBox>("Owner Name"))
 	{
-		view->setValue(mCreatorID);
+		if (owners_identical)
+		{
+			view->setValue(mOwnerID);
+		}
+		else
+		{
+			view->setValue(LLUUID::null);
+			view->setText(owner_app_link);
+		}
 		view->setEnabled(true);
 	}
 
-	if (auto view = getChild<LLUICtrl>("Owner Name"))
+	if (auto view = getChild<LLTextBox>("Last Owner Name"))
 	{
-		view->setValue(mOwnerID);
-		view->setEnabled(true);
-	}
-
-	if (auto view = getChild<LLUICtrl>("Last Owner Name"))
-	{
-		view->setValue(mLastOwnerID);
+		if (LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, owner_app_link))
+		{
+			view->setValue(mLastOwnerID);
+		}
+		else
+		{
+			view->setValue(LLUUID::null);
+			view->setText(owner_app_link);
+		}
 		view->setEnabled(true);
 	}