From 7e5bcc23cee589cb05fb3c2c314b92333a0818f8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 8 Jun 2011 02:06:06 -0500
Subject: Fixed some malformed XML in German IM / Group Chat floaters.

---
 .../indra/newview/skins/default/xui/de/floater_instant_message.xml  | 6 +++---
 .../newview/skins/default/xui/de/floater_instant_message_group.xml  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index fb40e39..fe38b2a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -36,21 +36,21 @@
 	<string name="add_friend_string">
 		Freund hinzufügen
 	</string>
-	<flyout_button label="Profil..." name="profile_callee_btn"/>
+	<flyout_button label="Profil..." name="profile_callee_btn">
     <flyout_button_item name="history_entry">
       Verlauf anzeigen
     </flyout_button_item>
     <flyout_button_item name="pay_entry">
       Bezahlen
     </flyout_button_item>
-    <flyout_button_name="teleport_entry">
+    <flyout_button_item name="teleport_entry">
      Teleport anbieten
     </flyout_button_item>
   </flyout_button>
 	<button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
 	<button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
   <text name="inventory_send">
-    Inventar hier hereinziehen (Drag & Drop), um es zu senden
+    Inventar hier hereinziehen (Drag &amp; Drop), um es zu senden
   </text>
 	<panel left_delta="111" name="speaker_controls">
 		<button label="" name="mute_btn" tool_tip="Voice stummschalten"/>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
index 04a8b08..848413c 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
@@ -38,7 +38,7 @@
 	</string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
-			<flyout_button label="Gruppeninfo" name="group_info_btn" width="85"/>
+			<flyout_button label="Gruppeninfo" name="group_info_btn" width="85">
         <flyout_button_item name="history_entry">
           Verlauf anzeigen
         </flyout_button_item>
-- 
cgit v1.1


From 30cc7e16054e94b3da4cf650a1c184aa97871964 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 8 Jun 2011 02:09:39 -0500
Subject: Added "FeatureNotAvailableOnOS" notification for future use.

It's intended to be used for informing the user that a feature is not
available on a certain operating system(s).
---
 .../indra/newview/skins/default/xui/en-us/notifications.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 42f1395..7f1d1a4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7473,6 +7473,19 @@ The Socks5 proxy "[PROXY]" refused the UDP associate request
 Could not connect to Socks5 proxy server "[PROXY]"
   </notification>
 
+
+  <notification
+   icon="alert.tga"
+   name="FeatureNotAvailableOnOS"
+   type="alert">
+Sorry, [FEATURE] is not yet available on [OS].
+  </notification>
+
+  <!-- Non-specific defaults for use with FeatureNotAvailableOnOS -->
+  <global name="this feature">this feature</global>
+  <global name="this os">this operating system</global>
+
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification
-- 
cgit v1.1


From 25e482393f2a5070da2b93e71b9d0c1babf0bdd2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 8 Jun 2011 02:10:44 -0500
Subject: Notification: View History (in IM/Group Chat) not available on Linux.

Temporary bandaid until IMP-182 is fully fixed.
---
 linden/indra/newview/llimpanel.cpp                             | 7 +++++++
 linden/indra/newview/skins/default/xui/de/notifications.xml    | 4 ++++
 linden/indra/newview/skins/default/xui/en-us/notifications.xml | 2 ++
 linden/indra/newview/skins/default/xui/zh/notifications.xml    | 4 ++++
 4 files changed, 17 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 5f6624b..4953a27 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1921,6 +1921,12 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
 	{
 		if (caller->getValue().asString() == "history_entry")
 		{
+#ifdef LL_LINUX
+			LLSD args;
+			args["[FEATURE]"] = LLNotifications::instance().getGlobalString("view history");
+			args["[OS]"] = "Linux";
+			LLNotifications::instance().add("FeatureNotAvailableOnOS", args, LLSD());
+#else // LL_LINUX
 			if (self->getOtherParticipantID().notNull())
 			{
 				std::string fullname = self->getTitle();
@@ -1948,6 +1954,7 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
 					//llinfos << file << " found" << llendl;
 				}
 			}
+#endif // LL_LINUX
 		}
 		// profile
 		else if (self->getIMType() == IM_PANEL_PLAIN)
diff --git a/linden/indra/newview/skins/default/xui/de/notifications.xml b/linden/indra/newview/skins/default/xui/de/notifications.xml
index b2975df..3009515 100644
--- a/linden/indra/newview/skins/default/xui/de/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/de/notifications.xml
@@ -3011,4 +3011,8 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter: http://
 	<global name="PermNo">
 		Nein
 	</global>
+
+
+  <global name="view history">Verlauf anzeigen</global>
+
 </notifications>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 7f1d1a4..cb8171d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7485,6 +7485,8 @@ Sorry, [FEATURE] is not yet available on [OS].
   <global name="this feature">this feature</global>
   <global name="this os">this operating system</global>
 
+  <global name="view history">View History</global>
+
 
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index ec675b2..1234e02 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3818,6 +3818,10 @@ Socks5 代理服务器 [PROXY] 拒绝了 UDP 关联请求
 无法连接到 Socks5 代理服务器 [PROXY]
   </notification>
 
+
+  <global name="view history">查看对话历史</global>
+
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification
-- 
cgit v1.1