From bd4c1fa8d8ade4a97d5afa8aa98419038c2286f9 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 1 Dec 2009 10:52:04 +0000
Subject: 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.

---
 indra/newview/llvoiceclient.cpp                | 6 ++++--
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

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>
-- 
cgit v1.2.3


From 3a2fcad0cb06c493f63771f6ca62dea2f4de2374 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 1 Dec 2009 13:07:41 +0000
Subject: DEV-41358: pass localization information to the Search web pages via
 a new ?lang=<LANG> query parameter.

---
 indra/newview/llfloatersearch.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index e2df2ffdf7..c8ff36b4f4 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -37,6 +37,7 @@
 #include "lllogininstance.h"
 #include "lluri.h"
 #include "llagent.h"
+#include "llui.h"
 
 LLFloaterSearch::LLFloaterSearch(const LLSD& key) :
 	LLFloater(key),
@@ -139,6 +140,9 @@ void LLFloaterSearch::search(const LLSD &key)
 	}
 	url += "&r=" + maturity;
 
+	// add the current localization information
+	url += "&lang=" + LLUI::getLanguage();
+
 	// and load the URL in the web view
 	mBrowser->navigateTo(url);
 }
-- 
cgit v1.2.3


From 5285a028232e8583051471f0f43f3f72f57de1e6 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 1 Dec 2009 13:17:31 +0000
Subject: EXT-2765: Added help IDs for tabs in the Places sidebar.

The issue was that the widgets for this panel are not built solely
from XUI. There's code in LLPanelPlaces::changeInventory() that
creates the actual My Inventory and Teleport History panels. Adding
help_topic strings to the relevant XUI files for the LLLandmarksPanel
and LLTeleportHistoryPanel classes fixes this issue.
---
 indra/newview/skins/default/xui/en/panel_landmarks.xml        | 1 +
 indra/newview/skins/default/xui/en/panel_teleport_history.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 4b91dc6294..c52b0c83d0 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -6,6 +6,7 @@
    layout="topleft" 
    left="0"
    width="380"
+   help_topic="panel_landmarks"
    border="true"
    background_visible="true"
    bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 01204ba779..32fc9fce01 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Teleport History" bottom="0" height="326" left="0" width="380"
+     help_topic="panel_teleport_history"
      border="true" follows="left|top|right|bottom">     
     <accordion
      follows="left|top|right|bottom"
-- 
cgit v1.2.3