From 186b60457808d5fb280531bc96aba8fc8b67ef12 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 9 May 2013 10:22:10 -0400 Subject: remove duplications and other errors introduced during the merge --- indra/llcommon/llavatarname.h | 5 ----- indra/llcommon/llfasttimer.cpp | 6 ------ 2 files changed, 11 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h index 87e7d95f32..7542a8dece 100644 --- a/indra/llcommon/llavatarname.h +++ b/indra/llcommon/llavatarname.h @@ -69,11 +69,6 @@ public: // *TODO: Eliminate this in favor of username only std::string getLegacyName() const; - // Returns "James Linden" or "bobsmith123 Resident" for backwards - // compatibility with systems like voice and muting - // *TODO: Eliminate this in favor of username only - std::string getLegacyName() const; - // "José Sanchez" or "James Linden", UTF-8 encoded Unicode // Takes the display name preference into account. This is truly the name that should // be used for all UI where an avatar name has to be used unless we truly want something else (rare) diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index ec94691cae..9b15804e97 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -567,12 +567,6 @@ LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer() return *NamedTimerFactory::instance().getRootTimer(); } -//static -LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer() -{ - return *NamedTimerFactory::instance().getRootTimer(); -} - //static void LLFastTimer::nextFrame() { -- cgit v1.2.3