diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
| commit | b4c36af1419c980fd6be032b44033852d036a790 (patch) | |
| tree | c3ec2084584eec2203b6661d6cca4650b100300e /indra/llcommon | |
| parent | ff0e3e6177812cdb6b3e044500d50f5d8d10434a (diff) | |
| parent | 92eadc18f3ea3538c36518f7060b4b78a80bc0d7 (diff) | |
merge changes for storm-547
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. |