diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-09 10:22:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-09 10:22:10 -0400 |
| commit | 186b60457808d5fb280531bc96aba8fc8b67ef12 (patch) | |
| tree | c2dd694263f33426a1fab690f77cba21b2035372 /indra/llcommon | |
| parent | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (diff) | |
remove duplications and other errors introduced during the merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llavatarname.h | 5 | ||||
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 6 |
2 files changed, 0 insertions, 11 deletions
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 @@ -568,12 +568,6 @@ LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer() } //static -LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer() -{ - return *NamedTimerFactory::instance().getRootTimer(); -} - -//static void LLFastTimer::nextFrame() { countsPerSecond(); // good place to calculate clock frequency |