diff options
author | James Cook <james@lindenlab.com> | 2010-02-01 17:06:18 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-02-01 17:06:18 -0800 |
commit | 146e9d5e4d9a9a4f33d9ccd47a901980972b7ab9 (patch) | |
tree | 534d2389e2d701819597cd0b56130a2551b41bfb /indra/newview/llavatariconctrl.h | |
parent | 130214c766763855b733c9b5d4e177afe0c39865 (diff) |
Support returning full_name (and SLID) for LLCacheName::get() calls
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
Diffstat (limited to 'indra/newview/llavatariconctrl.h')
-rw-r--r-- | indra/newview/llavatariconctrl.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h index 38616b7852..a5452ee1d3 100644 --- a/indra/newview/llavatariconctrl.h +++ b/indra/newview/llavatariconctrl.h @@ -92,20 +92,17 @@ public: void nameUpdatedCallback( const LLUUID& id, - const std::string& first, - const std::string& last, - BOOL is_group); + const std::string& name, + bool is_group); const LLUUID& getAvatarId() const { return mAvatarId; } - const std::string& getFirstName() const { return mFirstName; } - const std::string& getLastName() const { return mLastName; } + const std::string& getFullName() const { return mFullName; } void setDrawTooltip(bool value) { mDrawTooltip = value;} protected: LLUUID mAvatarId; - std::string mFirstName; - std::string mLastName; + std::string mFullName; bool mDrawTooltip; std::string mDefaultIconName; |