From fd7b0e19da95bf099c1769df8c72c719c2c379f2 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 19 Mar 2019 11:16:24 +0200 Subject: SL-10610 FIXED Floaters fails to display certain symbols. Added ability to load font collections. --- indra/llrender/llfontregistry.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llrender/llfontregistry.h') diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h index 177eb6c8a5..e30c81c630 100644 --- a/indra/llrender/llfontregistry.h +++ b/indra/llrender/llfontregistry.h @@ -40,6 +40,7 @@ public: LLFontDescriptor(); LLFontDescriptor(const std::string& name, const std::string& size, const U8 style); LLFontDescriptor(const std::string& name, const std::string& size, const U8 style, const string_vec_t& file_names); + LLFontDescriptor(const std::string& name, const std::string& size, const U8 style, const string_vec_t& file_names, const string_vec_t& font_collections); LLFontDescriptor normalize() const; bool operator<(const LLFontDescriptor& b) const; @@ -52,6 +53,8 @@ public: void setSize(const std::string& size) { mSize = size; } const std::vector& getFileNames() const { return mFileNames; } std::vector& getFileNames() { return mFileNames; } + const std::vector& getFontCollectionsList() const { return mFontCollectionsList; } + std::vector& getFontCollectionsList() { return mFontCollectionsList; } const U8 getStyle() const { return mStyle; } void setStyle(U8 style) { mStyle = style; } @@ -59,6 +62,7 @@ private: std::string mName; std::string mSize; string_vec_t mFileNames; + string_vec_t mFontCollectionsList; U8 mStyle; }; -- cgit v1.2.3