diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-05 15:19:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-05 15:19:42 +0300 |
| commit | 693c217da5aa6d405dd62c9bbed006074747983c (patch) | |
| tree | 44b2406c9b5e26b558caf415e69977baa8f6a112 /indra/llui/lltextparser.h | |
| parent | 4a702182daf872e77797a1ff7e6e3040c3c5806d (diff) | |
| parent | f63a371f92c90e73fd6e0bc42d33b75500a7e1c0 (diff) | |
Merge pull request #2190 from RyeMutt/color-debug-floater
Introduce LLUIColorTable debug-settings-alike floater and fix various color system bugs
Diffstat (limited to 'indra/llui/lltextparser.h')
| -rw-r--r-- | indra/llui/lltextparser.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltextparser.h b/indra/llui/lltextparser.h index 20fcc07e4c..c5756f9b4c 100644 --- a/indra/llui/lltextparser.h +++ b/indra/llui/lltextparser.h @@ -30,6 +30,7 @@ #include "llsd.h" #include "llsingleton.h" +#include "lluicolor.h" class LLUUID; class LLVector3d; @@ -45,7 +46,9 @@ public: typedef enum e_highlight_position { WHOLE, START, MIDDLE, END } EHighlightPosition; typedef enum e_dialog_action { ACTION_NONE, ACTION_CLOSE, ACTION_ADD, ACTION_COPY, ACTION_UPDATE } EDialogAction; - LLSD parsePartialLineHighlights(const std::string &text,const LLColor4 &color, EHighlightPosition part=WHOLE, S32 index=0); + using parser_out_vec_t = std::vector<std::pair<std::string, LLUIColor>>; + + parser_out_vec_t parsePartialLineHighlights(const std::string &text,const LLUIColor &color, EHighlightPosition part=WHOLE, S32 index=0); bool parseFullLineHighlights(const std::string &text, LLColor4 *color); private: |