diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-13 10:43:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-13 10:43:05 -0500 |
| commit | 942ff2cd8b0fe2787a9c0b85a4c61d853cd7d7dc (patch) | |
| tree | ed3afc28cbfded97336395fe62dd90ae2061f043 /indra/llxml/llxmlnode.h | |
| parent | 155ddf23363f1d5c534c69f50505faf67e51948f (diff) | |
| parent | ad6425173900855852b8c8437cc88120ea46cc53 (diff) | |
Merge pull request #1460 from secondlife/DRTVWR-600-maint-A
viewer#1420 Fixed names not showing in Chat
Diffstat (limited to 'indra/llxml/llxmlnode.h')
| -rw-r--r-- | indra/llxml/llxmlnode.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index 32aee057ed..e09c89c543 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -121,7 +121,7 @@ public: LLXMLNode(const char* name, bool is_attribute); LLXMLNode(LLStringTableEntry* name, bool is_attribute); LLXMLNode(const LLXMLNode& rhs); - LLXMLNodePtr deepCopy(); + LLXMLNodePtr deepCopy() const; bool isNull(); @@ -135,11 +135,11 @@ public: LLXMLNodePtr& node, LLXMLNode* defaults_tree, bool cacheable = false); - static bool parseBuffer( - const char* buffer, - U32 length, - LLXMLNodePtr& node, - LLXMLNode* defaults); + static bool parseBuffer( + const char* buffer, + U32 length, + LLXMLNodePtr& node, + LLXMLNode* defaults); static bool parseStream( std::istream& str, LLXMLNodePtr& node, @@ -290,6 +290,10 @@ public: protected: bool removeChild(LLXMLNode* child); + static bool parseBuffer( + const char* buffer, + U32 length, + LLXMLNodePtr& node); public: std::string mID; // The ID attribute of this node |