diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
|---|---|---|
| committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
| commit | ff52ac089f9ed67410f80fe66d0b997f0f2dafcc (patch) | |
| tree | bc0f195c198ddf3d6d338e48f79e419c246f03fa /indra/newview/skins/default | |
| parent | ff51d31af3d3c28e474c2831b38bbefa6f7732c5 (diff) | |
DEV-34822 viewer 1.23 merge
DEV-32649 Merge the diamondware/vivox voice code
-r124876
-r125220
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index fac7aef690..cb5cec7bdb 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -49,7 +49,7 @@ libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] Qt Webkit Version: [QT_WEBKIT_VERSION] -Vivox Version: [VIVOX_VERSION] +Voice Server Version: [VOICE_VERSION] </floater.string> <floater.string name="none"> |