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/llstartup.cpp | |
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 '')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index e29dc5a..b80a286 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -1884,8 +1884,7 @@ bool idle_startup() | |||
1884 | tmp = LLUserAuth::getInstance()->getResponse("max-agent-groups"); | 1884 | tmp = LLUserAuth::getInstance()->getResponse("max-agent-groups"); |
1885 | if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str())); | 1885 | if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str())); |
1886 | 1886 | ||
1887 | tmp = LLUserAuth::getInstance()->getResponse("VoiceConnector"); | 1887 | |
1888 | if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setVoiceConnector(tmp); | ||
1889 | gHippoGridManager->saveFile(); | 1888 | gHippoGridManager->saveFile(); |
1890 | gHippoLimits->setLimits(); | 1889 | gHippoLimits->setLimits(); |
1891 | 1890 | ||
@@ -1931,8 +1930,7 @@ bool idle_startup() | |||
1931 | } | 1930 | } |
1932 | // else llwarns << "MapServerURL empty"<< llendl; | 1931 | // else llwarns << "MapServerURL empty"<< llendl; |
1933 | 1932 | ||
1934 | // Pass the user information to the voice chat server interface. | 1933 | |
1935 | gVoiceClient->userAuthorized(firstname, lastname, gAgentID); | ||
1936 | } | 1934 | } |
1937 | else // if(successful_login) | 1935 | else // if(successful_login) |
1938 | { | 1936 | { |
@@ -2065,6 +2063,7 @@ bool idle_startup() | |||
2065 | LL_DEBUGS("AppInitStartupState") << "STATE_SEED_CAP_GRANTED" << LL_ENDL; | 2063 | LL_DEBUGS("AppInitStartupState") << "STATE_SEED_CAP_GRANTED" << LL_ENDL; |
2066 | update_texture_fetch(); | 2064 | update_texture_fetch(); |
2067 | 2065 | ||
2066 | |||
2068 | if ( gViewerWindow != NULL) | 2067 | if ( gViewerWindow != NULL) |
2069 | { // This isn't the first logon attempt, so show the UI | 2068 | { // This isn't the first logon attempt, so show the UI |
2070 | gViewerWindow->setNormalControlsVisible( TRUE ); | 2069 | gViewerWindow->setNormalControlsVisible( TRUE ); |
@@ -2123,6 +2122,9 @@ bool idle_startup() | |||
2123 | // | 2122 | // |
2124 | LL_INFOS("AppInit") << "Initializing communications..." << LL_ENDL; | 2123 | LL_INFOS("AppInit") << "Initializing communications..." << LL_ENDL; |
2125 | 2124 | ||
2125 | // Pass the user information to the voice chat server interface. | ||
2126 | gVoiceClient->userAuthorized(firstname, lastname, gAgentID); | ||
2127 | |||
2126 | // register callbacks for messages. . . do this after initial handshake to make sure that we don't catch any unwanted | 2128 | // register callbacks for messages. . . do this after initial handshake to make sure that we don't catch any unwanted |
2127 | register_viewer_callbacks(gMessageSystem); | 2129 | register_viewer_callbacks(gMessageSystem); |
2128 | 2130 | ||
@@ -2142,7 +2144,7 @@ bool idle_startup() | |||
2142 | gCacheName->addObserver(callback_cache_name); | 2144 | gCacheName->addObserver(callback_cache_name); |
2143 | 2145 | ||
2144 | // Load stored cache if possible | 2146 | // Load stored cache if possible |
2145 | LLAppViewer::instance()->loadNameCache(); | 2147 | LLAppViewer::instance()->loadNameCache(); |
2146 | 2148 | ||
2147 | // Start cache in not-running state until we figure out if we have | 2149 | // Start cache in not-running state until we figure out if we have |
2148 | // capabilities for display name lookup | 2150 | // capabilities for display name lookup |