diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
| commit | f2a1f0df3a3c8ce18179ea06992f5e5d07f2f773 (patch) | |
| tree | cd571814ec2e9d11ef05f8107e068ca6702df2a6 /indra/llcommon | |
| parent | 4a083db6c52d2cc5c1cd1f908270f5952ace6505 (diff) | |
| parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llavatarname.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llavatarname.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp index b1ec9e9875..ad1845d387 100644 --- a/indra/llcommon/llavatarname.cpp +++ b/indra/llcommon/llavatarname.cpp @@ -48,7 +48,7 @@ LLAvatarName::LLAvatarName() mLegacyFirstName(), mLegacyLastName(), mIsDisplayNameDefault(false), - mIsDummy(false), + mIsTemporaryName(false), mExpires(F64_MAX), mNextUpdate(0.0) { } diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h index 145aeccd35..ba258d6d52 100644 --- a/indra/llcommon/llavatarname.h +++ b/indra/llcommon/llavatarname.h @@ -79,7 +79,7 @@ public: // Under error conditions, we may insert "dummy" records with // names like "???" into caches as placeholders. These can be // shown in UI, but are not serialized. - bool mIsDummy; + bool mIsTemporaryName; // Names can change, so need to keep track of when name was // last checked. |