diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
| commit | 508686047d5e98934d5fefbb576e54f108df6fe3 (patch) | |
| tree | 6d751588cc200395d4fef41e61f4683a83a7ab86 /indra/llmessage/mean_collision_data.h | |
| parent | 2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff) | |
| parent | f53f6f20df5c99311103c3d92938ce878d474f13 (diff) | |
Merge from http://hg.secondlife.com/viewer-identity (display names)
Diffstat (limited to 'indra/llmessage/mean_collision_data.h')
| -rw-r--r-- | indra/llmessage/mean_collision_data.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llmessage/mean_collision_data.h b/indra/llmessage/mean_collision_data.h index cf1063eb55..29de091603 100644 --- a/indra/llmessage/mean_collision_data.h +++ b/indra/llmessage/mean_collision_data.h @@ -55,7 +55,7 @@ public: LLMeanCollisionData(LLMeanCollisionData *mcd) : mVictim(mcd->mVictim), mPerp(mcd->mPerp), mTime(mcd->mTime), mType(mcd->mType), mMag(mcd->mMag), - mFirstName(mcd->mFirstName), mLastName(mcd->mLastName) + mFullName(mcd->mFullName) { } @@ -89,8 +89,7 @@ public: time_t mTime; EMeanCollisionType mType; F32 mMag; - std::string mFirstName; - std::string mLastName; + std::string mFullName; }; |