Merge branch 'main' into release/luau-scripting for Maint X release.

1 files changed, 28 insertions, 0 deletions

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index a41b7ba4a8..877585cbef 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -898,6 +898,34 @@ F32 LLView::getTooltipTimeout()
     : tooltip_delay);
 }
 
+// virtual
+const std::string LLView::getToolTip() const
+{
+    if (sDebugUnicode)
+    {
+        std::string text = getText();
+        if (!text.empty())
+        {
+            const std::string& name = getName();
+            std::string tooltip = llformat("Name: \"%s\"", name.c_str());
+
+            if (const LLFontGL* font = getFont())
+            {
+                tooltip += llformat("\nFont: %s (%s)",
+                    font->getFontDesc().getName().c_str(),
+                    font->getFontDesc().getSize().c_str()
+                );
+            }
+
+            tooltip += "\n\n" + utf8str_showBytesUTF8(text);
+
+            return tooltip;
+        }
+    }
+
+    return mToolTipMsg.getString();
+}
+
 BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask)
 {
     BOOL handled = FALSE;