diff options
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 12 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 8 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.h | 6 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_avatar_other.xml | 12 |
5 files changed, 20 insertions, 19 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 4cf51b3d13..53df40d172 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1238,6 +1238,7 @@ Sovereign Engineer OPEN-195 OPEN-217 OPEN-295 + STORM-2107 SpacedOut Frye VWR-34 VWR-45 diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index cf44a5c69b..482ae76613 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2991,11 +2991,11 @@ class LLAvatarCheckImpostorMode : public view_listener_t switch (mode) { case 0: - return (avatar->getVisualMuteSettings() == LLVOAvatar::VISUAL_MUTE_NOT_SET); + return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_RENDER_NORMALLY); case 1: - return (avatar->getVisualMuteSettings() == LLVOAvatar::ALWAYS_VISUAL_MUTE); + return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_DO_NOT_RENDER); case 2: - return (avatar->getVisualMuteSettings() == LLVOAvatar::NEVER_VISUAL_MUTE); + return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_ALWAYS_RENDER); default: return false; } @@ -3017,13 +3017,13 @@ class LLAvatarSetImpostorMode : public view_listener_t switch (mode) { case 0: - avatar->setVisualMuteSettings(LLVOAvatar::VISUAL_MUTE_NOT_SET); + avatar->setVisualMuteSettings(LLVOAvatar::AV_RENDER_NORMALLY); break; case 1: - avatar->setVisualMuteSettings(LLVOAvatar::ALWAYS_VISUAL_MUTE); + avatar->setVisualMuteSettings(LLVOAvatar::AV_DO_NOT_RENDER); break; case 2: - avatar->setVisualMuteSettings(LLVOAvatar::NEVER_VISUAL_MUTE); + avatar->setVisualMuteSettings(LLVOAvatar::AV_ALWAYS_RENDER); break; default: return false; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index e29cc7147c..3106e2b6d1 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -699,7 +699,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mLastSkinTime(0.f), mUpdatePeriod(1), mVisualComplexityStale(true), - mVisuallyMuteSetting(VISUAL_MUTE_NOT_SET), + mVisuallyMuteSetting(AV_RENDER_NORMALLY), mMutedAVColor(calcMutedAVColor(getID())), mFirstFullyVisible(TRUE), mFullyLoaded(FALSE), @@ -3088,11 +3088,11 @@ bool LLVOAvatar::isVisuallyMuted() const // * check against the render cost and attachment limits if (!isSelf()) { - if (mVisuallyMuteSetting == NEVER_VISUAL_MUTE) + if (mVisuallyMuteSetting == AV_ALWAYS_RENDER) { muted = false; } - else if (mVisuallyMuteSetting == ALWAYS_VISUAL_MUTE) + else if (mVisuallyMuteSetting == AV_DO_NOT_RENDER) { // Always want to see this AV as an impostor muted = true; } @@ -8082,7 +8082,7 @@ void LLVOAvatar::updateImpostors() LLVOAvatar* avatar = (LLVOAvatar*) *iter; if (!avatar->isDead() && avatar->isVisible() && (avatar->isImpostor() && avatar->needsImpostorUpdate()) - && (avatar->getVisualMuteSettings() != ALWAYS_VISUAL_MUTE)) + && (avatar->getVisualMuteSettings() != AV_DO_NOT_RENDER)) { gPipeline.generateImpostor(avatar); } diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 1b6809f6c7..a49aa73035 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -388,9 +388,9 @@ public: enum VisualMuteSettings { - VISUAL_MUTE_NOT_SET = 0, - ALWAYS_VISUAL_MUTE = 1, - NEVER_VISUAL_MUTE = 2 + AV_RENDER_NORMALLY = 0, + AV_DO_NOT_RENDER = 1, + AV_ALWAYS_RENDER = 2 }; void setVisualMuteSettings(VisualMuteSettings set) { mVisuallyMuteSetting = set; }; VisualMuteSettings getVisualMuteSettings() { return mVisuallyMuteSetting; }; diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index cfbbe41f95..9d882aaf37 100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -106,8 +106,8 @@ <menu_item_separator /> <menu_item_check - name="Normal" - label="Normal Rendering"> + name="Render Normally" + label="Render Normally"> <menu_item_check.on_check function="Avatar.CheckImpostorMode" parameter="0" /> @@ -116,8 +116,8 @@ parameter="0" /> </menu_item_check> <menu_item_check - name="Always use impostor" - label="Always use impostor"> + name="DoNotRender" + label="Do Not Render"> <menu_item_check.on_check function="Avatar.CheckImpostorMode" parameter="1" /> @@ -126,8 +126,8 @@ parameter="1" /> </menu_item_check> <menu_item_check - name="Never use impostor" - label="Never use impostor"> + name="AlwaysRenderFully" + label="Always Render Fully"> <menu_item_check.on_check function="Avatar.CheckImpostorMode" parameter="2" /> |