summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-02-23 10:33:56 -0500
committerOz Linden <oz@lindenlab.com>2016-02-23 10:33:56 -0500
commit9353dd38b1922c4e01d90c469df4013e21b6e9e2 (patch)
treea81afdc90120a29f2db6da4ff1a5263461b5ac13 /indra/newview/llvoavatar.h
parent588d2e194d27555088220ed7ea8153ab2787659b (diff)
parentd7d4ffb0c4fda4e765a54115945a34eda28f9d1c (diff)
Merged in Ansariel/391-blizzard-performance-fix (pull request #18)
Restore cached mute check for improved performance
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rwxr-xr-xindra/newview/llvoavatar.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 75194bb8c5..10d10b2ed5 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -387,7 +387,8 @@ public:
public:
U32 renderImpostor(LLColor4U color = LLColor4U(255,255,255,255), S32 diffuse_channel = 0);
- bool isVisuallyMuted() const;
+ bool isVisuallyMuted();
+ bool isInMuteList();
void forceUpdateVisualMuteSettings();
enum VisualMuteSettings
@@ -426,6 +427,8 @@ public:
mutable bool mVisualComplexityStale;
U32 mReportedVisualComplexity; // from other viewers through the simulator
+ bool mCachedInMuteList;
+ F64 mCachedMuteListUpdateTime;
VisualMuteSettings mVisuallyMuteSetting; // Always or never visually mute this AV