summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-12 14:52:18 -0400
committerOz Linden <oz@lindenlab.com>2011-09-12 14:52:18 -0400
commite26bd6c140c24d72b44966127825fef5bbe47c1d (patch)
treec70214a7a7e898b528f6b0f3ec6d47992969fe97 /indra/newview/llavatariconctrl.cpp
parent08b75949998adbe3bbb4ef1d1d7e49405e468c94 (diff)
parent1c57963673193d5a3da638848c0540a5fbc91603 (diff)
merge changes for storm-1593 (marketplace inbox)
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";
}