From f935453859ac01a51717db458f7575134e08aea4 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 4 Nov 2013 22:54:44 -0500 Subject: [PATCH] Allow v3 xui style strings for anything panel derived. --- indra/llui/llpanel.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index c6ff2fa03..66d09954d 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -530,11 +530,13 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f void LLPanel::initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory) { + std::string kidstring(node->getName()->mString); + kidstring += ".string"; LLXMLNodePtr child; for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling()) { // look for string declarations for programmatic text - if (child->hasName("string")) + if (child->hasName("string") || child->hasName(kidstring)) { std::string string_name; child->getAttributeString("name", string_name);