diff options
author | Armin Weatherwax | 2011-05-22 02:23:05 +0200 |
---|---|---|
committer | Armin Weatherwax | 2011-05-22 02:59:20 +0200 |
commit | ab350d3cb38e1bcba0bbc50cf92408cb41d543fb (patch) | |
tree | 4c390617db99ddb8929edfbbbaa09dd8e94aa0ed /linden/indra/newview/app_settings | |
parent | Add missing debug about stopping internet stream. (diff) | |
download | meta-impy-ab350d3cb38e1bcba0bbc50cf92408cb41d543fb.zip meta-impy-ab350d3cb38e1bcba0bbc50cf92408cb41d543fb.tar.gz meta-impy-ab350d3cb38e1bcba0bbc50cf92408cb41d543fb.tar.bz2 meta-impy-ab350d3cb38e1bcba0bbc50cf92408cb41d543fb.tar.xz |
revamp the voice client.
* split the "voice" debug tag into several tags for usable filtering while debugging
* remove debug-spam from user view by:
* remove capability request spam by:
* llstartup the voice client state engine when actually a region is present, and not the initial fake region.
* don't request a capability to determine if (the very same) capability can be requested.
* don't do it over and over as if a capability rezzed in like an avatar. Its available - or not (see llstartup).
* unload the daemon if not used.
* load vivox daemon depending on specific criteria in the caps
* remove the partial implementation to load a specific daemon with via the openregion message or the login response.
* discard obsolete caps.
Tested and working on linux: Parcel changing, region changing, (SL) voice-disabled region private call, (SL) private call region changing, (OS) no voice <-> voice region changing, (OS) mumble <-> freeswitch region changing.
To test: Mac, Win. Anything that needs to be tested and not mentioned above.
Diffstat (limited to 'linden/indra/newview/app_settings')
-rw-r--r-- | linden/indra/newview/app_settings/logcontrol.xml | 5 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml index c9e9127..f0db00f 100644 --- a/linden/indra/newview/app_settings/logcontrol.xml +++ b/linden/indra/newview/app_settings/logcontrol.xml | |||
@@ -90,7 +90,12 @@ | |||
90 | <!--<string>TextureCache</string>--> | 90 | <!--<string>TextureCache</string>--> |
91 | <!--<string>Throttle</string>--> | 91 | <!--<string>Throttle</string>--> |
92 | <!--<string>Voice</string>--> | 92 | <!--<string>Voice</string>--> |
93 | <!--<string>"VoiceCaps"</string>--> | ||
94 | <!--<string>VoiceSession</string>--> | ||
95 | <!--<string>VoiceDaemon</string>--> | ||
96 | <!--<string>VoiceDevice</string>--> | ||
93 | <!--<string>VivoxProtocolParser</string>--> | 97 | <!--<string>VivoxProtocolParser</string>--> |
98 | |||
94 | <!--<string>Wearable</string>--> | 99 | <!--<string>Wearable</string>--> |
95 | <!--<string>WindLight</string>--> | 100 | <!--<string>WindLight</string>--> |
96 | 101 | ||
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 24ff619..eac7674 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -39,16 +39,27 @@ | |||
39 | <key>Value</key> | 39 | <key>Value</key> |
40 | <integer>0</integer> | 40 | <integer>0</integer> |
41 | </map> | 41 | </map> |
42 | <key>VoiceModule</key> | 42 | <key>VoiceModuleMumble</key> |
43 | <map> | 43 | <map> |
44 | <key>Comment</key> | 44 | <key>Comment</key> |
45 | <string>Executable file that runs voice. Platform specific parts (like .exe on windows) are added automatically.</string> | 45 | <string>Executable file that runs mumble voice . Platform specific parts (like .exe on windows) are added automatically, paths are stripped off if present. Defaults to mumble if empty</string> |
46 | <key>Persist</key> | 46 | <key>Persist</key> |
47 | <integer>1</integer> | 47 | <integer>1</integer> |
48 | <key>Type</key> | 48 | <key>Type</key> |
49 | <string>String</string> | 49 | <string>String</string> |
50 | <key>Value</key> | 50 | <key>Value</key> |
51 | <string>SLVoice</string> | 51 | <string /> |
52 | </map> | ||
53 | <key>VoiceModuleVivox</key> | ||
54 | <map> | ||
55 | <key>Comment</key> | ||
56 | <string>Executable file that runs vivox voice. Platform specific parts (like .exe on windows) are added automatically, paths are stripped off if present. Defaults to SLVoice if empty.</string> | ||
57 | <key>Persist</key> | ||
58 | <integer>1</integer> | ||
59 | <key>Type</key> | ||
60 | <string>String</string> | ||
61 | <key>Value</key> | ||
62 | <string /> | ||
52 | </map> | 63 | </map> |
53 | 64 | ||
54 | <!-- end Aurora-specific settings --> | 65 | <!-- end Aurora-specific settings --> |