diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 12:41:00 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 12:41:00 +0100 |
| commit | f33fff7e15947859f9c89cd5297971a28205bca8 (patch) | |
| tree | 4abe6618d6bc69432707f23369587190d1ef544d /indra/newview/llavatarpropertiesprocessor.h | |
| parent | e275b7a658ee29ca4ce3dd77908ddd4c34749449 (diff) | |
| parent | 5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff) | |
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llavatarpropertiesprocessor.h')
| -rw-r--r-- | indra/newview/llavatarpropertiesprocessor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h index 716c1b8065..b9e8bfd0ab 100644 --- a/indra/newview/llavatarpropertiesprocessor.h +++ b/indra/newview/llavatarpropertiesprocessor.h @@ -67,7 +67,7 @@ struct LLAvatarData LLUUID partner_id; std::string about_text; std::string fl_about_text; - std::string born_on; + LLDate born_on; std::string profile_url; U8 caption_index; std::string caption_text; |