From 668307e4e3b59ac4f4f955aa0d36183c361352b8 Mon Sep 17 00:00:00 2001 From: Robin Cornelius Date: Wed, 23 Feb 2011 15:50:55 -0500 Subject: STORM-1019 Add ability to display beacons for Media on a Prim objects Changes merged into viewer 2 by Jonathan Yap --- indra/newview/skins/default/xui/en/floater_beacons.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 4fc2b698d8..3d29356b22 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -1,7 +1,7 @@ + + + -- cgit v1.2.3 From f5b3d13b7f3a0aafb0848e76fda190698fe0815b Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Thu, 3 Mar 2011 19:06:39 +0200 Subject: STORM-1036 FIXED The unused "How to create a new Classified ad" notification removed from XUI ("en" locale only). --- indra/newview/skins/default/xui/en/notifications.xml | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f008042a81..44bfff81f4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -751,21 +751,6 @@ You need to enter either the Username or both the First and Last name of your av - -Classified ads appear in the 'Classified' section of the Search directory and on [http://secondlife.com/community/classifieds secondlife.com] for one week. -Fill out your ad, then click 'Publish...' to add it to the directory. -You'll be asked for a price to pay when clicking Publish. -Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords. - - - Date: Wed, 16 Mar 2011 18:32:28 -0400 Subject: STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button" --- indra/newview/skins/default/xui/en/menu_bottomtray.xml | 2 +- indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index 1b55fa4fd3..63bfd39e29 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -9,7 +9,7 @@ visible="false" width="128"> + +Click the Speak button to turn your microphone off and on. + +Your microphone is on by default. + +Click on the up arrow to see the voice control panel. + +Hiding the Speak button will disable the voice feature. + + Date: Tue, 22 Mar 2011 19:42:58 +0200 Subject: STORM-1030 FIXED Main menu change: 'Me->Change Outfit' to 'Me->My Appearance' Changed label in: - Main menu - Self avatar menu - Self avatar attachment menu --- indra/newview/skins/default/xui/en/menu_attachment_self.xml | 2 +- indra/newview/skins/default/xui/en/menu_avatar_self.xml | 2 +- indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index 84e81397be..b8128da358 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -68,7 +68,7 @@ name="Stand Up"> function="Self.EnableStandUp" /> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml index 2afa29ec10..d727294cc8 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -193,7 +193,7 @@ -- cgit v1.2.3 From f818d1a5a43d9dd5e580a798cf511c5052ac12db Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 23 Mar 2011 20:48:53 -0400 Subject: STORM-1077 Eliminated separator bar between Speak Button and other menu entries. --- indra/newview/skins/default/xui/en/menu_bottomtray.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index 63bfd39e29..07dabe1909 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -19,7 +19,6 @@ function="CheckControl" parameter="EnableVoiceChat" /> - Date: Thu, 24 Mar 2011 12:07:47 -0400 Subject: STORM-1077 Change hint wording. Disable hint if speak or flyout button is pressed. --- indra/newview/skins/default/xui/en/notifications.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 85b8cac944..b478cf869e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6611,9 +6611,7 @@ Mute everyone? label="Speak" type="hint" unique="true"> -Click the Speak button to turn your microphone off and on. - -Your microphone is on by default. +Click the Speak button to turn your microphone on and off. Click on the up arrow to see the voice control panel. -- cgit v1.2.3