diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-11 14:56:51 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-11 14:56:51 -0800 |
| commit | 064c91ae520fb157ed8ed314e43ce87e0a3bab99 (patch) | |
| tree | 5fb550989d1f458aa52f408fb2d7c67da4f5c8aa /indra/newview/llavatariconctrl.h | |
| parent | 310ce5527526d36cb2e66aafb00c177e352c80c7 (diff) | |
| parent | b4e3d34791497188537680a4556ccacaa004db09 (diff) | |
Merge from product-engine
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 5eb830df4b..38616b7852 100644 --- a/indra/newview/llavatariconctrl.h +++ b/indra/newview/llavatariconctrl.h @@ -74,6 +74,7 @@ public: { Optional <LLUUID> avatar_id; Optional <bool> draw_tooltip; + Optional <std::string> default_icon_name; Params(); }; @@ -106,7 +107,7 @@ protected: std::string mFirstName; std::string mLastName; bool mDrawTooltip; - + std::string mDefaultIconName; bool updateFromCache(); }; |