summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-14 14:54:20 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-14 14:54:20 -0400
commit4b269f67ea8d053b4c05a9c002811901c8ec8a49 (patch)
tree401f44f1c339fc8fa847c355129d91cacd2bd22a /indra/newview/llavatariconctrl.cpp
parentdf40eca093b1a238daea9cd23c44f6e39719bf51 (diff)
parentb2d20f5a989bde2c4db90091bec37d310cc346fc (diff)
merge
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
-rw-r--r--indra/newview/llavatariconctrl.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index d0f4d19f56..42e7decec1 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -141,7 +141,6 @@ LLAvatarIconCtrl::Params::Params()
draw_tooltip("draw_tooltip", true),
default_icon_name("default_icon_name")
{
- name = "avatar_icon";
}