diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-01 10:52:04 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-01 10:52:04 +0000 |
| commit | bd4c1fa8d8ade4a97d5afa8aa98419038c2286f9 (patch) | |
| tree | 2089469def1b799be923a9f65d8fceaa3c2951f1 /indra/newview | |
| parent | 6223485bfafb9343f4e352014dec7f53717bcb47 (diff) | |
DEV-40702: Internationalize the unknown Vivox version string rather
than hardcode it in llvoiceclient.cpp. Also rename the string from
"Unknown" to "Not connected", to better reflect the fact that we get
the Vivox version once voice is connected.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index d677634be6..7e1e7c940f 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -63,6 +63,7 @@ #include "llparcel.h" #include "llviewerparcelmgr.h" #include "llfirstuse.h" +#include "lltrans.h" #include "llviewerwindow.h" #include "llviewercamera.h" #include "llvoavatarself.h" @@ -1161,11 +1162,12 @@ LLVoiceClient::LLVoiceClient() : mVoiceEnabled(false), mWriteInProgress(false), - mLipSyncEnabled(false), - mAPIVersion("Unknown") + mLipSyncEnabled(false) { gVoiceClient = this; + mAPIVersion = LLTrans::getString("NotConnected"); + #if LL_DARWIN || LL_LINUX || LL_SOLARIS // HACK: THIS DOES NOT BELONG HERE // When the vivox daemon dies, the next write attempt on our socket generates a SIGPIPE, which kills us. diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4b727e36ab..e47ec1ebda 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -267,6 +267,7 @@ <string name="ChangePermissions">Change its permissions</string> <string name="TrackYourCamera">Track your camera</string> <string name="ControlYourCamera">Control your camera</string> + <string name="NotConnected">Not Connected</string> <!-- Sim Access labels --> <string name="SIM_ACCESS_PG">PG</string> |