From a902138de15067a86a6aeb02fdabd094873da0b2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 Apr 2024 00:40:01 +0300
Subject: triage#166 Select 'No Description' when clicking on a text field

Default value should be selected for replacement
---
 indra/newview/llsidepaneliteminfo.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'indra/newview/llsidepaneliteminfo.cpp')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index d6d5a4ef2d..2045820090 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -56,6 +56,8 @@
 #include "llviewerregion.h"
 
 
+const char* const DEFAULT_DESC = "(No Description)";
+
 class PropertiesChangedCallback : public LLInventoryCallback
 {
 public:
@@ -128,6 +130,7 @@ LLSidepanelItemInfo::LLSidepanelItemInfo(const LLPanel::Params& p)
 	, mUpdatePendingId(-1)
     , mIsDirty(false) /*Not ready*/
     , mParentFloater(NULL)
+    , mLabelItemDesc(NULL)
 {
     gInventory.addObserver(this);
     gIdleCallbacks.addFunction(&LLSidepanelItemInfo::onIdle, (void*)this);
@@ -158,10 +161,11 @@ BOOL LLSidepanelItemInfo::postBuild()
     mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
     mLabelOwnerName = getChild<LLTextBox>("LabelOwnerName");
     mLabelCreatorName = getChild<LLTextBox>("LabelCreatorName");
+    mLabelItemDesc = getChild<LLTextEditor>("LabelItemDesc");
     
 	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
-	getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
+    mLabelItemDesc->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
     // Thumnail edition
     mChangeThumbnailBtn->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onEditThumbnail, this));
 	// acquired date
@@ -342,10 +346,14 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	getChildView("LabelItemName")->setEnabled(is_modifiable && !is_calling_card); // for now, don't allow rename of calling cards
 	getChild<LLUICtrl>("LabelItemName")->setValue(item->getName());
 	getChildView("LabelItemDescTitle")->setEnabled(TRUE);
-	getChildView("LabelItemDesc")->setEnabled(is_modifiable);
-	getChild<LLUICtrl>("LabelItemDesc")->setValue(item->getDescription());
     getChild<LLUICtrl>("item_thumbnail")->setValue(item->getThumbnailUUID());
 
+    // Asset upload substitutes empty description with a (No Description) placeholder
+    std::string desc = item->getDescription();
+    mLabelItemDesc->setSelectAllOnFocusReceived(desc == DEFAULT_DESC);
+    mLabelItemDesc->setValue(desc);
+    mLabelItemDesc->setEnabled(is_modifiable);
+
     LLUIImagePtr icon_img = LLInventoryIcon::getIcon(item->getType(), item->getInventoryType(), item->getFlags(), FALSE);
     mItemTypeIcon->setImage(icon_img);
  
@@ -927,17 +935,22 @@ void LLSidepanelItemInfo::onCommitDescription()
 	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 
-    LLTextEditor* labelItemDesc = getChild<LLTextEditor>("LabelItemDesc");
-	if(!labelItemDesc)
+	if(!mLabelItemDesc)
 	{
 		return;
 	}
-	if((item->getDescription() != labelItemDesc->getText()) && 
-	   (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE)))
+    if (!gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE))
+    {
+        return;
+    }
+    std::string old_desc = item->getDescription();
+    std::string new_desc = mLabelItemDesc->getText();
+	if(old_desc != new_desc)
 	{
+        mLabelItemDesc->setSelectAllOnFocusReceived(false);
 		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 
-		new_item->setDescription(labelItemDesc->getText());
+		new_item->setDescription(new_desc);
 		onCommitChanges(new_item);
 	}
 }
-- 
cgit v1.3