diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
| commit | 8f7ec64899c54dcee6caa0307510cc4003ba7bdd (patch) | |
| tree | 513093c8550e0baf567d10168b9f750ba869fc21 /indra/newview/llavatariconctrl.h | |
| parent | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (diff) | |
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/llavatariconctrl.h')
| -rw-r--r-- | indra/newview/llavatariconctrl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h index cb1e9584ba..e34f2ff474 100644 --- a/indra/newview/llavatariconctrl.h +++ b/indra/newview/llavatariconctrl.h @@ -46,9 +46,10 @@ public: Optional <LLUUID> avatar_id; Optional <bool> draw_tooltip; Params() + : avatar_id("avatar_id"), + draw_tooltip("draw_tooltip", true) { name = "avatar_icon"; - draw_tooltip = TRUE; } }; protected: |