diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-11 17:59:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-11 17:59:29 -0400 |
| commit | 58db3502238db8c1580783d6d89bf8946bc863da (patch) | |
| tree | 6714bcc9826045d5691f0510c069e456092e6c8b /indra/newview/llvoavatar.h | |
| parent | d81383b46824404cf01c097324e8c1bc2cb0cece (diff) | |
MAINT-5622: correct rendering of explicitly derendered and blocked avatars
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rwxr-xr-x | indra/newview/llvoavatar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index fb19f4eb2e..4b5c0593e8 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -324,7 +324,7 @@ public: static void logPendingPhasesAllAvatars(); void logMetricsTimerRecord(const std::string& phase_name, F32 elapsed, bool completed); - static LLColor4 calcMutedAVColor(const LLUUID av_id); + void calcMutedAVColor(); protected: LLViewerStats::PhaseMap& getPhases() { return mPhases; } @@ -394,7 +394,7 @@ public: AV_DO_NOT_RENDER = 1, AV_ALWAYS_RENDER = 2 }; - void setVisualMuteSettings(VisualMuteSettings set) { mVisuallyMuteSetting = set; }; + void setVisualMuteSettings(VisualMuteSettings set); VisualMuteSettings getVisualMuteSettings() { return mVisuallyMuteSetting; }; U32 renderRigid(); |