diff options
| author | Armin Weatherwax | 2011-05-31 21:22:08 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2011-06-01 00:36:01 +0200 |
| commit | 39a5ef5971d97c350f36739f5c33e7196474cc95 (patch) | |
| tree | cf65b3cf864c1f0905e56ac79ba2a9c419e9b603 /linden/indra/newview/llvoiceclient.h | |
| parent | Replaced the labels in the web browser window with icons based on those in th... (diff) | |
| download | meta-impy-39a5ef5971d97c350f36739f5c33e7196474cc95.zip meta-impy-39a5ef5971d97c350f36739f5c33e7196474cc95.tar.gz meta-impy-39a5ef5971d97c350f36739f5c33e7196474cc95.tar.bz2 meta-impy-39a5ef5971d97c350f36739f5c33e7196474cc95.tar.xz | |
fix an edge case when voice didn't kick in; fix reconnect to voice not working
Diffstat (limited to 'linden/indra/newview/llvoiceclient.h')
| -rw-r--r-- | linden/indra/newview/llvoiceclient.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h index fb59b4e..f5c6d87 100644 --- a/linden/indra/newview/llvoiceclient.h +++ b/linden/indra/newview/llvoiceclient.h | |||
| @@ -678,7 +678,6 @@ static std::string displayNameFromAvatar(LLVOAvatar *avatar); | |||
| 678 | static std::string nameFromsipURI(const std::string &uri); | 678 | static std::string nameFromsipURI(const std::string &uri); |
| 679 | 679 | ||
| 680 | bool inSpatialChannel(void); | 680 | bool inSpatialChannel(void); |
| 681 | bool inNonSpatialChannel(void); | ||
| 682 | std::string getAudioSessionURI(); | 681 | std::string getAudioSessionURI(); |
| 683 | std::string getAudioSessionHandle(); | 682 | std::string getAudioSessionHandle(); |
| 684 | 683 | ||