diff options
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.h | 6 | ||||
| -rw-r--r-- | indra/llrender/llfontregistry.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 204c6908af..77cd12250c 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -264,7 +264,7 @@ protected: typedef std::map<llwchar,embedded_data_t*> embedded_map_t; mutable embedded_map_t mEmbeddedChars; - LLFontDescriptor mFontDesc; + LLFontDescriptor mFontDescriptor; // Registry holds all instantiated fonts. static LLFontRegistry* sFontRegistry; @@ -276,8 +276,8 @@ public: static LLCoordFont sCurOrigin; static std::vector<LLCoordFont> sOriginStack; - const LLFontDescriptor &getFontDesc() const { return mFontDesc; } - void setFontDesc(const LLFontDescriptor& font_desc) { mFontDesc = font_desc; } + const LLFontDescriptor &getFontDesc() const { return mFontDescriptor; } + void setFontDesc(const LLFontDescriptor& font_desc) { mFontDescriptor = font_desc; } }; #endif diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 18e4a6915d..3b5c62a5ea 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -104,7 +104,7 @@ bool removeSubString(std::string& str, const std::string& substr) size_t pos = str.find(substr); if (pos != string::npos) { - str.replace(pos,substr.length(),(const char *)NULL, 0); + str.erase(pos); return true; } return false; |