diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d82e62e285..8f5ad63cc3 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2773,7 +2773,7 @@ void LLStartUp::initNameCache() LLAppViewer::instance()->loadNameCache(); // JAMESDEBUG TODO: won't need service url here, will use capability - LLAvatarNameCache::initClass("http://pdp15.lindenlab.com:8050/my-service/"); + LLAvatarNameCache::initClass("http://pdp60.lindenlab.com:8000/"); } void LLStartUp::cleanupNameCache() diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 6aac53dd73..74ff9b74b6 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3065,7 +3065,7 @@ LLColor4 LLVOAvatar::getNameTagColor(bool is_friend) LLAvatarName av_name; if (LLAvatarNameCache::useDisplayNames() && LLAvatarNameCache::get(getID(), &av_name) - && av_name.mIsLegacy) + && av_name.mIsDisplayNameDefault) { color_name = "NameTagLegacy"; } |