diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 10:55:48 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 10:55:48 -0700 |
commit | 1c7b1532e994f8c4d1c69e419e34f07c1a9ee918 (patch) | |
tree | ff5b60dbc6887a7a7420728a06804fa268720211 /indra/newview/llavatariconctrl.cpp | |
parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
parent | 78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (diff) |
Merge from viewer-experience
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
-rw-r--r-- | indra/newview/llavatariconctrl.cpp | 1 |
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"; } |