diff options
author | Armin Weatherwax | 2010-03-25 15:25:49 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-05-04 02:15:11 -0500 |
commit | f6ed529f2237975fb9a205cc6340a7159e44a404 (patch) | |
tree | 1bc6fa181e58107c618918b4e457376bf684a621 /linden/indra/newview/llvoiceclient.h | |
parent | Clicking the money balance now does nothing on non-SL grids. (diff) | |
download | meta-impy-f6ed529f2237975fb9a205cc6340a7159e44a404.zip meta-impy-f6ed529f2237975fb9a205cc6340a7159e44a404.tar.gz meta-impy-f6ed529f2237975fb9a205cc6340a7159e44a404.tar.bz2 meta-impy-f6ed529f2237975fb9a205cc6340a7159e44a404.tar.xz |
disable voice temporaryly where no caps avail (renables on parcel change)
Diffstat (limited to 'linden/indra/newview/llvoiceclient.h')
-rw-r--r-- | linden/indra/newview/llvoiceclient.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h index cfc336b..d2ec752 100644 --- a/linden/indra/newview/llvoiceclient.h +++ b/linden/indra/newview/llvoiceclient.h | |||
@@ -330,6 +330,7 @@ static void updatePosition(void); | |||
330 | bool mIsP2P; | 330 | bool mIsP2P; |
331 | bool mIncoming; | 331 | bool mIncoming; |
332 | bool mVoiceEnabled; | 332 | bool mVoiceEnabled; |
333 | bool mVoiceTemporaryDisabled; | ||
333 | bool mReconnect; // Whether we should try to reconnect to this session if it's dropped | 334 | bool mReconnect; // Whether we should try to reconnect to this session if it's dropped |
334 | // Set to true when the mute state of someone in the participant list changes. | 335 | // Set to true when the mute state of someone in the participant list changes. |
335 | // The code will have to walk the list to find the changed participant(s). | 336 | // The code will have to walk the list to find the changed participant(s). |
@@ -725,6 +726,7 @@ static std::string nameFromsipURI(const std::string &uri); | |||
725 | bool mMicVolumeDirty; | 726 | bool mMicVolumeDirty; |
726 | 727 | ||
727 | bool mVoiceEnabled; | 728 | bool mVoiceEnabled; |
729 | bool mVoiceTemporaryDisabled; | ||
728 | bool mWriteInProgress; | 730 | bool mWriteInProgress; |
729 | std::string mWriteString; | 731 | std::string mWriteString; |
730 | size_t mWriteOffset; | 732 | size_t mWriteOffset; |