diff options
Diffstat (limited to 'linden/indra/newview/llvoiceclient.h')
-rw-r--r-- | linden/indra/newview/llvoiceclient.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h index 9fc6a7d..13dd974 100644 --- a/linden/indra/newview/llvoiceclient.h +++ b/linden/indra/newview/llvoiceclient.h | |||
@@ -502,16 +502,19 @@ static void updatePosition(void); | |||
502 | // Note: if you change this list, please make corresponding changes to LLVoiceClient::state2string(). | 502 | // Note: if you change this list, please make corresponding changes to LLVoiceClient::state2string(). |
503 | enum state | 503 | enum state |
504 | { | 504 | { |
505 | stateDisableCleanup, | ||
505 | stateDisabled, // Voice is turned off. | 506 | stateDisabled, // Voice is turned off. |
506 | stateStart, // Class is initialized, socket is created | 507 | stateStart, // Class is initialized, socket is created |
507 | stateDaemonLaunched, // Daemon has been launched | 508 | stateDaemonLaunched, // Daemon has been launched |
508 | stateConnecting, // connect() call has been issued | 509 | stateConnecting, // connect() call has been issued |
510 | stateConnected, // connection to the daemon has been made, send some initial setup commands. | ||
509 | stateIdle, // socket is connected, ready for messaging | 511 | stateIdle, // socket is connected, ready for messaging |
510 | stateNeedsProvision, // Need to do a ProvisionVoiceAccountRequest | 512 | stateMicTuningStart, |
513 | stateMicTuningRunning, | ||
514 | stateMicTuningStop, | ||
511 | stateConnectorStart, // connector needs to be started | 515 | stateConnectorStart, // connector needs to be started |
512 | stateConnectorStarting, // waiting for connector handle | 516 | stateConnectorStarting, // waiting for connector handle |
513 | stateConnectorStarted, // connector handle received | 517 | stateConnectorStarted, // connector handle received |
514 | stateMicTuningNoLogin, // mic tuning before login | ||
515 | stateLoginRetry, // need to retry login (failed due to changing password) | 518 | stateLoginRetry, // need to retry login (failed due to changing password) |
516 | stateLoginRetryWait, // waiting for retry timer | 519 | stateLoginRetryWait, // waiting for retry timer |
517 | stateNeedsLogin, // send login request | 520 | stateNeedsLogin, // send login request |
@@ -519,9 +522,6 @@ static void updatePosition(void); | |||
519 | stateLoggedIn, // account handle received | 522 | stateLoggedIn, // account handle received |
520 | stateCreatingSessionGroup, // Creating the main session group | 523 | stateCreatingSessionGroup, // Creating the main session group |
521 | stateNoChannel, // | 524 | stateNoChannel, // |
522 | stateMicTuningStart, | ||
523 | stateMicTuningRunning, | ||
524 | stateMicTuningStop, | ||
525 | stateJoiningSession, // waiting for session handle | 525 | stateJoiningSession, // waiting for session handle |
526 | stateSessionJoined, // session handle received | 526 | stateSessionJoined, // session handle received |
527 | stateRunning, // in session, steady state | 527 | stateRunning, // in session, steady state |