From fedfbbb8d8696044cace410365e348b20a1e2420 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 15 Apr 2010 16:20:29 -0700 Subject: Remove hack to set display name by talking directly to name service This means display names will only work on grids with name code deployed --- indra/newview/llviewerdisplayname.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'indra/newview/llviewerdisplayname.cpp') diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp index 9739c7fbc1..1cfada48ad 100644 --- a/indra/newview/llviewerdisplayname.cpp +++ b/indra/newview/llviewerdisplayname.cpp @@ -70,14 +70,9 @@ void LLViewerDisplayName::set(const std::string& display_name, const set_name_sl std::string cap_url = region->getCapability("SetDisplayName"); if (cap_url.empty()) { - // JAMESDEBUG HACK for demos, fall back to prototype name service - llinfos << "Set name via legacy service" << llendl; - LLAvatarNameCache::setDisplayName(gAgent.getID(), display_name, slot); - return; - // this server does not support display names, report error - //slot(false, "unsupported", LLSD()); - //return; + slot(false, "unsupported", LLSD()); + return; } llinfos << "Set name POST to " << cap_url << llendl; -- cgit v1.2.3