diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/newview/llavatarpropertiesprocessor.h | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/llavatarpropertiesprocessor.h')
| -rw-r--r-- | indra/newview/llavatarpropertiesprocessor.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h index 79d109f1db..ea80c3d4f8 100644 --- a/indra/newview/llavatarpropertiesprocessor.h +++ b/indra/newview/llavatarpropertiesprocessor.h @@ -36,6 +36,7 @@ #include "lluuid.h" #include "llsingleton.h" #include "v3dmath.h" // LLVector3d +#include <list> #include <map> /* @@ -147,8 +148,7 @@ class LLAvatarPropertiesProcessor public: LLAvatarPropertiesProcessor(); - virtual ~LLAvatarPropertiesProcessor() - {} + virtual ~LLAvatarPropertiesProcessor(); void addObserver(const LLUUID& avatar_id, LLAvatarPropertiesObserver* observer); @@ -174,11 +174,6 @@ public: void sendPickDelete(const LLUUID& pick_id); - // Convert a date provided by the server (MM/DD/YYYY) into a localized, - // human-readable age (1 year, 2 months) using translation strings from - // the XML file. - static std::string ageFromDate(const std::string& date_string); - // Returns translated, human readable string for account type, such // as "Resident" or "Linden Employee". Used for profiles, inspectors. static std::string accountType(const LLAvatarData* avatar_data); |