summaryrefslogtreecommitdiff
path: root/indra/newview/llviewchildren.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-10-05 15:50:24 -0700
committerMonroe Linden <monroe@lindenlab.com>2009-10-05 15:50:24 -0700
commit39ee2367a7e771890017fc3d663780437ea69bb2 (patch)
treeb84c3ade59dba5ae032a3123afb9c3c5f78c9b68 /indra/newview/llviewchildren.cpp
parent374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff)
parent6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff)
Merging due to changes since my last pull.
Diffstat (limited to 'indra/newview/llviewchildren.cpp')
-rw-r--r--indra/newview/llviewchildren.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewchildren.cpp b/indra/newview/llviewchildren.cpp
index 842ffc7f9a..41eafa871d 100644
--- a/indra/newview/llviewchildren.cpp
+++ b/indra/newview/llviewchildren.cpp
@@ -74,17 +74,6 @@ void LLViewChildren::setText(
}
}
-void LLViewChildren::setWrappedText(
- const std::string& id, const std::string& text, bool visible)
-{
- LLTextBox* child = mParent.getChild<LLTextBox>(id);
- if (child)
- {
- child->setVisible(visible);
- child->setWrappedText(text);
- }
-}
-
void LLViewChildren::setBadge(const std::string& id, Badge badge, bool visible)
{
LLIconCtrl* child = mParent.getChild<LLIconCtrl>(id);