diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llstylemap.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llstylemap.cpp')
| -rw-r--r-- | indra/newview/llstylemap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp index 09578a011a..0f092b31c4 100644 --- a/indra/newview/llstylemap.cpp +++ b/indra/newview/llstylemap.cpp @@ -60,11 +60,11 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID &source) { LLStyleSP style(new LLStyle); style->setVisible(true); - style->setFontName(LLString::null); + style->setFontName(LLStringUtil::null); if (source != gAgent.getID() && source != LLUUID::null) { style->setColor(gSavedSettings.getColor4("HTMLLinkColor")); - LLString link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str()); + std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str()); style->setLinkHREF(link); } else |