diff options
| author | callum <none@none> | 2011-01-28 11:20:36 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-01-28 11:20:36 -0800 |
| commit | b46281211a8f8774f307980216142805ea8b0a3b (patch) | |
| tree | 21a7b416af038813cd393af8ab9e3a80475b72ed /indra/llcommon | |
| parent | ac7d7fea8288b1d6f5dec65f9dee5053d097fff5 (diff) | |
| parent | 7b7e9b0d0bd9c35acb346ae359f9a08a48b248a2 (diff) | |
Merge
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. |