diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-22 00:38:41 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-22 00:38:41 +0100 |
| commit | 93342e3201cfd83b4cda0a194e900999d3753f46 (patch) | |
| tree | baf920c83925f423b38a99db10584fc0fdbd1c4f /indra/newview/llvoiceclient.cpp | |
| parent | 4859db1adabcf84b959ff0603f1bb8401232164c (diff) | |
| parent | 6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff) | |
Merge 5.1.9
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 503815e2ed..e1dca4ae43 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -79,7 +79,7 @@ LLVoiceHandler gVoiceHandler; std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserver::EStatusType inStatus) { - std::string result = "UNKNOWN"; + std::string result = "UNTRANSLATED"; // Prevent copy-paste errors when updating this list... #define CASE(x) case x: result = #x; break @@ -92,12 +92,18 @@ std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv CASE(STATUS_JOINED); CASE(STATUS_LEFT_CHANNEL); CASE(STATUS_VOICE_DISABLED); + CASE(STATUS_VOICE_ENABLED); CASE(BEGIN_ERROR_STATUS); CASE(ERROR_CHANNEL_FULL); CASE(ERROR_CHANNEL_LOCKED); CASE(ERROR_NOT_AVAILABLE); CASE(ERROR_UNKNOWN); default: + { + std::ostringstream stream; + stream << "UNKNOWN(" << (int)inStatus << ")"; + result = stream.str(); + } break; } |