diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
| commit | 0080ed8e2914fba475b224344d8e4233e8fa48e2 (patch) | |
| tree | c316dd991d5b54a19594639686215230a89736b4 /indra/newview/llcallingcard.h | |
| parent | 0b44850c6f1057cd095ed9fe68f9285e546c662e (diff) | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llcallingcard.h')
| -rw-r--r-- | indra/newview/llcallingcard.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llcallingcard.h b/indra/newview/llcallingcard.h index 15ca51743a..8803cce59d 100644 --- a/indra/newview/llcallingcard.h +++ b/indra/newview/llcallingcard.h @@ -235,8 +235,7 @@ public: virtual bool operator()(const LLUUID& buddy_id, LLRelationship* buddy); typedef std::map<std::string, LLUUID, LLDictionaryLess> buddy_map_t; buddy_map_t mMappable; - std::string mFirst; - std::string mLast; + std::string mFullName; }; // collect dictionary sorted map of name -> agent_id for every online buddy @@ -248,8 +247,7 @@ public: virtual bool operator()(const LLUUID& buddy_id, LLRelationship* buddy); typedef std::map<std::string, LLUUID, LLDictionaryLess> buddy_map_t; buddy_map_t mOnline; - std::string mFirst; - std::string mLast; + std::string mFullName; }; // collect dictionary sorted map of name -> agent_id for every buddy, @@ -263,8 +261,7 @@ public: typedef std::map<std::string, LLUUID, LLDictionaryLess> buddy_map_t; buddy_map_t mOnline; buddy_map_t mOffline; - std::string mFirst; - std::string mLast; + std::string mFullName; }; #endif // LL_LLCALLINGCARD_H |