diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
| commit | a0714f01804a2a2220bd72c3adf06f097ad21b73 (patch) | |
| tree | db304a8eca349020b48ae927fd8a534264a6ed83 /indra/llmessage/mean_collision_data.h | |
| parent | e3ecffc180ae50a0e8b726a061ec39cbe591326e (diff) | |
| parent | de6f7e19c44d267d3224c56941c2ab27677c406f (diff) | |
Merge with viewer-development
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; }; |