From a235f3d5ea734db03a1a64901c893016f0320f18 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 26 Feb 2010 16:58:29 -0800
Subject: [PATCH] Clean out some dead code
---
indra/newview/llhudtext.h | 2 --
indra/newview/llvoavatar.cpp | 10 ----------
2 files changed, 12 deletions(-)
diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h
index f7248ceffcd..8219358cc1e 100644
--- a/indra/newview/llhudtext.h
+++ b/indra/newview/llhudtext.h
@@ -34,7 +34,6 @@
#define LL_LLHUDTEXT_H
#include "llpointer.h"
-//#include "lldarrayptr.h"
#include "llhudobject.h"
#include "v4color.h"
@@ -45,7 +44,6 @@
#include "llfontgl.h"
#include <set>
#include <vector>
-//#include "lldarray.h"
// Renders a 2D text billboard floating at the location specified.
class LLDrawable;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 93662a030f8..9a9fbc22e25 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2882,7 +2882,6 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
mNameFriend = is_friend;
mTitle = title ? title->getString() : "";
LLStringFn::replace_ascii_controlchars(mTitle,LL_UNKNOWN_CHAR);
-// mNameString = utf8str_to_wstring(line);
new_name = TRUE;
}
@@ -2892,10 +2891,6 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
mNameText->setFont(LLFontGL::getFontSansSerif());
mNameText->setTextAlignment(LLHUDText::ALIGN_TEXT_LEFT);
mNameText->setFadeDistance(CHAT_NORMAL_RADIUS * 2.f, 5.f);
-// if (new_name)
-// {
-// mNameText->setLabel(mNameString);
-// }
char line[MAX_STRING]; /* Flawfinder: ignore */
line[0] = '\0';
@@ -2968,11 +2963,6 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
mNameText->setTextAlignment(LLHUDText::ALIGN_TEXT_CENTER);
mNameText->setFadeDistance(CHAT_NORMAL_RADIUS, 5.f);
mNameText->setVisibleOffScreen(FALSE);
-// if (new_name)
-// {
-// mNameText->setLabel("");
-// mNameText->setString(mNameString);
-// }
}
}
--
GitLab