diff options
author | Jacek Antonelli | 2010-05-08 16:25:10 -0500 |
---|---|---|
committer | Jacek Antonelli | 2010-05-08 16:25:10 -0500 |
commit | 571bdc9fcfaec5182f6f020b6a31815ad9696da7 (patch) | |
tree | 5ab0e5d5bafedfe24a3171697522974a64572e53 /linden/indra/newview/llvoiceclient.h | |
parent | Removed the "Settings" section of Advanced Build Preferences. (diff) | |
download | meta-impy-571bdc9fcfaec5182f6f020b6a31815ad9696da7.zip meta-impy-571bdc9fcfaec5182f6f020b6a31815ad9696da7.tar.gz meta-impy-571bdc9fcfaec5182f6f020b6a31815ad9696da7.tar.bz2 meta-impy-571bdc9fcfaec5182f6f020b6a31815ad9696da7.tar.xz |
Revert "disable voice temporaryly where no caps avail (renables on parcel change)"
It could potentially have unintended consequences for private voice
conversations.
This reverts commit f6ed529f2237975fb9a205cc6340a7159e44a404.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvoiceclient.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h index d2ec752..cfc336b 100644 --- a/linden/indra/newview/llvoiceclient.h +++ b/linden/indra/newview/llvoiceclient.h | |||
@@ -330,7 +330,6 @@ 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; | ||
334 | bool mReconnect; // Whether we should try to reconnect to this session if it's dropped | 333 | bool mReconnect; // Whether we should try to reconnect to this session if it's dropped |
335 | // Set to true when the mute state of someone in the participant list changes. | 334 | // Set to true when the mute state of someone in the participant list changes. |
336 | // The code will have to walk the list to find the changed participant(s). | 335 | // The code will have to walk the list to find the changed participant(s). |
@@ -726,7 +725,6 @@ static std::string nameFromsipURI(const std::string &uri); | |||
726 | bool mMicVolumeDirty; | 725 | bool mMicVolumeDirty; |
727 | 726 | ||
728 | bool mVoiceEnabled; | 727 | bool mVoiceEnabled; |
729 | bool mVoiceTemporaryDisabled; | ||
730 | bool mWriteInProgress; | 728 | bool mWriteInProgress; |
731 | std::string mWriteString; | 729 | std::string mWriteString; |
732 | size_t mWriteOffset; | 730 | size_t mWriteOffset; |