Second Life viewer sources 1.21.2-RC

5 files changed, 19 insertions, 14 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 57736b4..1dcdc7d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -2101,8 +2101,22 @@ You do not have permission to buy land for your active group.
         </alert>
         <alert modal="true" name="AddFriend" title="Add Friend">
                 <message name="message">
-                        Friends can give permissions to track each 
-other on the map and receive online status updates. 
+Friends can give permissions to track each
+other on the map and receive online status updates.
+
+Offer friendship to [NAME]?
+                </message>
+                <option name="Offer">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="AddFriendWithMessage" title="Add Friend">
+                <message name="message">
+Friends can give permissions to track each
+other on the map and receive online status updates.
 
 Offer friendship to [NAME]?
                 </message>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 2108b42..96f48eb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
@@ -10,10 +10,10 @@
              follows="left|top|bottom|right" height="150" left="10" multi_select="true"
              name="objects_list" width="530">
                 <column label="Score" name="score" width="55" />
-                <column dynamicwidth="true" label="Name" name="name" />
+                <column label="Name" name="name" width="140"/>
                 <column label="Owner" name="owner" width="105" />
                 <column label="Location" name="location" width="130" />
-                <column label="Time" name="time" width="180" />
+                <column label="Time" name="time" width="100" />
         </scroll_list>
         <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
              left="10" name="id_text" width="100">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 60f70b2..6af19ee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -997,7 +997,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
         </notify>
         <notify name="ProximalVoiceChannelFull" tip="true" unique="true">
                 <message name="message">
-                        We&apos;re sorry.  This area has has reached maximum capacity for voice conversations.  Please try to use voice in another area.
+                        We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
                 </message>
         </notify>
         <notify name="VoiceChannelDisconnected" tip="true" unique="true">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 62fb7b7..7d72001 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -36,11 +36,6 @@
              name="voice_chat_description" tab_stop="false" width="450" word_wrap="true">

                 Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.

         </text_editor>

-<!--    <check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true" -->

-<!--         follows="left|top" font="SansSerifSmall" height="16" initial_value="false" -->

-<!--         label="Start Viewer in Push-to-Talk mode" left_delta="0" -->

-<!--         mouse_opaque="true" name="push_to_talk_check" radio_style="false" -->

-<!--         width="200" /> -->

         <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"

              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

              label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true"

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
index 0ecf3fc..494cd39 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
@@ -20,10 +20,6 @@
              font="SansSerifSmall" height="16" initial_value="false"

              label="Only allow Friends to initiate Voice Calls with me" left="20"

              left_delta="2" name="friends_only_check" width="200" />

-<!--    <check_box bottom_delta="-20" control_name="EnablePushToTalk" follows="left|top" -->

-<!--         font="SansSerifSmall" height="16" initial_value="false" -->

-<!--         label="Start Viewer in Push-to-Talk mode" left_delta="0" -->

-<!--         name="push_to_talk_check" width="200" /> -->

         <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"

              font="SansSerifSmall" height="16" initial_value="false"

              label="Use Push-to-Talk in toggle mode" left_delta="0"