From e06c322971aeba9a065efb6f53139010243aa428 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 17:43:49 +0200
Subject: SL-19134 Multiline description field
---
indra/newview/llsidepaneliteminfo.cpp | 4 ++--
.../newview/skins/default/xui/en/sidepanel_item_info.xml | 16 ++++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 2402827ca0..ccc57c63ab 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -46,6 +46,7 @@
#include "lllineeditor.h"
#include "llradiogroup.h"
#include "llslurl.h"
+#include "lltexteditor.h"
#include "llviewercontrol.h"
#include "llviewerinventory.h"
#include "llviewerobjectlist.h"
@@ -158,7 +159,6 @@ BOOL LLSidepanelItemInfo::postBuild()
getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
- getChild<LLLineEditor>("LabelItemDesc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
// acquired date
// owner permissions
@@ -909,7 +909,7 @@ void LLSidepanelItemInfo::onCommitDescription()
LLViewerInventoryItem* item = findItem();
if(!item) return;
- LLLineEditor* labelItemDesc = getChild<LLLineEditor>("LabelItemDesc");
+ LLTextEditor* labelItemDesc = getChild<LLTextEditor>("LabelItemDesc");
if(!labelItemDesc)
{
return;
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 7fb9fb828d..8b0f8f7550 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -183,7 +183,7 @@ TestString PleaseIgnore
name="layout_item_description"
layout="topleft"
follows="all"
- height="61">
+ height="84">
<text
type="string"
length="1"
@@ -196,19 +196,23 @@ TestString PleaseIgnore
width="78">
Description:
</text>
- <line_editor
+ <text_editor
+ text_type="ascii_printable_no_pipe"
+ commit_on_focus_lost="true"
border_style="line"
border_thickness="1"
- follows="left|top|right"
+ word_wrap="true"
+ use_ellipses="false"
+ follows="all"
layout="topleft"
left="5"
top_pad="5"
right="-5"
- height="23"
- max_length_bytes="127"
+ height="46"
+ max_length="127"
name="LabelItemDesc"
tool_tip="When people have 'Hover Tips on All Objects' selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
-
+
<text
type="string"
length="1"
--
cgit v1.2.3