summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.h
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-24 15:11:46 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-24 15:11:46 +0100
commit0fc44d319fbc0e5865e0ca76b51b2f436b72ad87 (patch)
tree7afc2730257120763c4c70822d079e04e0bc6a40 /indra/newview/llvoicevivox.h
parent6bcac50f64a00b2bf6eaea13813276bf7c78af81 (diff)
EXT-7335 WIP Clean up warnings when parsing Vivox timestamps.
Tidied up initialization of voice font expiry timers.
Diffstat (limited to 'indra/newview/llvoicevivox.h')
-rw-r--r--indra/newview/llvoicevivox.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index d71fe132c5..debc03377f 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -900,8 +900,8 @@ private:
S32 mFontStatus;
bool mIsNew;
- LLTimer mExpiryTimer;
- LLTimer mExpiryWarningTimer;
+ LLFrameTimer mExpiryTimer;
+ LLFrameTimer mExpiryWarningTimer;
};
bool mVoiceFontsReceived;
@@ -916,7 +916,7 @@ private:
typedef std::set<LLVoiceEffectObserver*> voice_font_observer_set_t;
voice_font_observer_set_t mVoiceFontObservers;
- LLTimer mVoiceFontExpiryTimer;
+ LLFrameTimer mVoiceFontExpiryTimer;
// Audio capture buffer