Merge branch 'master' into AISv3-WIP

Conflicts: indra/newview/llinventorybridge.cpp
2015-06-27 01:30:28 -05:00
parent a380161283 1e488fef6d
commit 3f3ead0988
108 changed files with 1129 additions and 675 deletions
--- a/indra/newview/skins/dark/colors.xml
+++ b/indra/newview/skins/dark/colors.xml
@@ -98,8 +98,8 @@
 <NotifyTextColor value="200, 200, 200, 255"/>
 <NotifyCautionBoxColor value="254, 209, 118, 255"/>		<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="70, 170, 255, 255"/>
-<GroupNotifyTextColor value="0, 0, 0 255" />
+<GroupNotifyBoxColor value="66, 66, 66, 255"/>
+<GroupNotifyTextColor value="200, 200, 200, 255"/>

 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
 <ChatHistoryBgColor value="30, 30, 30, 200" />
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -39,6 +39,6 @@ ein.</text>
 	<check_box label="Zeit in Sekunden" name="wait_time_check"/>
 	
 	<check_box label="Aktiv" name="active_check" tool_tip="Aktive Gesten werden durch Chat-Eingabe ihrer Auslösephrasen oder Drücken von Tastenkürzeln ausgelöst.  Bei doppelten Tastenzuweisungen funktionieren Gesten in der Regel nicht."/>
-	<button label="Vorschau" name="preview_btn"/>
+	<flyout_button label="Vorschau" name="preview_btn"/>
 	<button label="Speichern" name="save_btn"/>
 </floater>
--- a/indra/newview/skins/default/xui/de/floater_radar.xml
+++ b/indra/newview/skins/default/xui/de/floater_radar.xml
@@ -65,12 +65,6 @@

 		<panel label="Optionen" name="options_tab">
 			<check_box label="Aktualisieren" name="update_enabled_cb" tool_tip="Einstellen ob die Avatarliste sich aktualisieren soll"/>
-			<text name="rate">Intervall:</text>
-			<radio_group name="update_rate" tool_tip="Intervall für Radar-Aktualisierung (verbraucht mehr FPS wenn höher)">
-				<radio_item name="high">Hoch</radio_item>
-				<radio_item name="medium">Mittel</radio_item>
-				<radio_item name="low">Niedrig</radio_item>
-			</radio_group>
 			<check_box label="Ansagen auch wenn geschlossen" name="keep_open" tool_tip="Fenster verbergen aber Ansagen in Chat weiterführen"/>
 			<check_box label="IDs an HUD senden" name="radar_chat_keys" tool_tip="Avatar IDs an LSL scripte senden"/>
 			<button name="send_keys_btn" label="Jetzt anzeigen" tool_tip="Alle IDs jetzt an HUD senden"/>
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -2,12 +2,12 @@
 <floater name="Snapshot" title="Foto-Anzeige">
 	<text name="file_size_label">Dateigröße: [SIZE] KB</text>
 	<text name="type_label">Ziel</text>
-	<radio_group label="Fototyp" name="snapshot_type_radio">
-		<radio_item name="feed">Sende an Profil-Feed</radio_item>
-		<radio_item name="postcard">Per E-Mail senden</radio_item>
-		<radio_item name="texture">Speichere in Inventar ([UPLOADFEE])</radio_item>
-		<radio_item name="local">Auf Festplatte speichern</radio_item>
-	</radio_group>
+	<combo_box name="snapshot_type_radio">
+		<combo_item name="feed">Sende an Profil-Feed</combo_item>
+		<combo_item name="postcard">Per E-Mail senden</combo_item>
+		<combo_item name="texture">Speichere in Inventar</combo_item>
+		<combo_item name="local">Auf Festplatte speichern</combo_item>
+	</combo_box>
 	<button label="Aktualisieren" name="new_snapshot_btn"/>
 	<button label="Einfrieren" name="freeze_time_btn" tool_tip="Zeige Vollansicht. Erlaubt Kammeraführung als stünde die Zeit still, um mehrere Fotos der gleichen Szene zu machen. ESC beendet den Zustand!"/>
 	<button label="Hochladen" name="feed_btn"/>
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -37,7 +37,7 @@
 	<check_box label="Position" name="radio position"/>
 	<check_box label="Drehen (Strg)" name="radio rotate"/>
 	<check_box label="Dehnen (Strg-Umschalt)" name="radio stretch"/>
-	<check_box label="Textur auswählen" name="radio select face"/>
+	<check_box label="Fläche auswählen" name="radio select face"/>
 	<check_box label="Ausrichten" name="radio align"/>
 	<check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">Lineal:</text>
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -19,7 +19,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.</s
 	<text_editor name="charter">Gruppencharta</text_editor>
 	<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
 	<button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
-	<text name="text_owners_and_visible_members">Eigentümer und sichtbare Mitglieder</text>
+	<text name="text_owners_and_visible_members">Eigentümer und sichtbare Mitglieder ([COUNT])</text>
 	<text name="text_owners_are_shown_in_bold">(Eigentümer werden fettgedruckt angezeigt)</text>
 	<name_list name="visible_members">
 		<column label="Mitgliedsname" name="name"/>
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -2796,6 +2796,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Unnamed">(Nicht benannt)</string>
 	<string name="inventory_item_offered_to">Inventory item offered to</string>
 	<string name="Saved_message" value="(Saved [LONG_TIMESTAMP]) "/>
+	<string name="IM_unblock_only_groups_friends">
+		Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ &gt; „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren.
+	</string>
 	<string name="StartPointSet">Start point set</string>
 	<string name="EndPointSet">End point set</string>
 	<string name="MeasuredDistance">Distance: [DIST]</string>
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -16,6 +16,7 @@
      <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
      <flyout_button_item label="Copy SLURL" name="copy_slurl_item" value="-1"/>
    </flyout_button>
+    <string name="find on map" value="Find on Map"/>
    <string name="ding on" value="Ding on new messages (On)"/>
    <string name="ding off" value="Ding on new messages (Off)"/>
    <string name="rp mode on" value="RP Mode (On)"/>
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
@@ -20,6 +20,7 @@
      <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
      <flyout_button_item label="Copy SLURL" name="copy_slurl_item" value="-1"/>
    </flyout_button>
+    <string name="find on map" value="Find on Map"/>
    <string name="ding on" value="Ding on new messages (On)"/>
    <string name="ding off" value="Ding on new messages (Off)"/>
    <string name="rp mode on" value="RP Mode (On)"/>
--- a/indra/newview/skins/default/xui/en-us/floater_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -296,29 +296,8 @@
 				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
 				   initial_value="true" enabled="true" radio_style="false" 
 				   tool_tip="Set whether the avatar list should update" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				   bottom_delta="-24" drop_shadow_visible="true" enabled="true" font="SansSerifSmall" height="18" left="24"
-				   mouse_opaque="false" name="rate" width="30">
-					Rate:
-			</text>
-			<radio_group draw_border="true" bottom_delta="2" left_delta="44" follows="bottom|left" width="196" height="20"
-				   mouse_opaque="true" name="update_rate" control_name="RadarUpdateRate" enabled="true"
-				   tool_tip="Rate of the radar updates (eats up more FPS when higher)">
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="4" mouse_opaque="true"
-		     		 	name="high" width="20" follows="bottom|left">
-					High
-				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="30" mouse_opaque="true"
-		     		 	name="medium" width="25" follows="bottom|left">
-					Medium
-				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="35" mouse_opaque="true"
-		     		 	name="low" width="20" follows="bottom|left">
-					Low
-				</radio_item>
-			</radio_group>
 			<check_box height="16" label="Announce even when closed"
-				   left="10" bottom_delta="-24" name="keep_open"
+				   left="10" bottom_delta="-20" name="keep_open"
 				   width="200" follows="bottom|left"
 				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
 				   initial_value="true" enabled="true" radio_style="false"
--- a/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" follows="left|top" height="629" name="Snapshot"
+     can_resize="false" follows="left|top" height="566" name="Snapshot"
     rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="219">
 	<text bottom="-210" right="-10" follows="left|top" height="25" name="file_size_label" halign="right" width="150">
 		File size: [SIZE] KB
@@ -8,22 +8,21 @@
 	<text bottom_delta="10" follows="top|left" height="15" left="10" name="type_label">
 		Target
 	</text>
-	<radio_group bottom_delta="-82" follows="left|top" height="79" label="Snapshot type"
-	     left="10" name="snapshot_type_radio" width="200">
-		<radio_item bottom="-19" height="16" name="feed">
+	<combo_box bottom_delta="-23" follows="left|top" height="20" left="10" name="snapshot_type_radio" width="200">
+		<combo_item name="feed" value="0">
 			Post to profile feed
-		</radio_item>
-		<radio_item bottom="-38" height="16" name="postcard">
+		</combo_item>
+		<combo_item name="postcard" value="1">
 			Send via email
-		</radio_item>
-		<radio_item bottom="-57" height="16" name="texture">
-			Save to inventory ([UPLOADFEE])
-		</radio_item>
-		<radio_item bottom="-76" height="16" name="local">
+		</combo_item>
+		<combo_item name="texture" value="2">
+			Save to inventory
+		</combo_item>
+		<combo_item name="local" value="3">
 			Save to hard drive
-		</radio_item>
-	</radio_group>
-	<button bottom="-309" follows="left|top" height="20" label="Refresh" left="10"
+		</combo_item>
+	</combo_box>
+	<button bottom="-250" follows="left|top" height="20" label="Refresh" left="10"
 	  name="new_snapshot_btn" width="105"/>
 	<button bottom_delta="0" follows="left|top" height="20" label="Freeze" left="120"
 	     name="freeze_time_btn" width="90" tool_tip="Show a fullscreen preview. Allows camming around as if time is frozen to make multiple snapshots of the same scene. Press ESC to undo!" />
@@ -39,7 +38,7 @@
    <flyout_button_item value="saveas" name="saveas_item">Save As...</flyout_button_item>
 	</flyout_button>
 	<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120" name="discard_btn" width="90"/>
-	<button bottom="-353" follows="left|top" font="SansSerifSmall" halign="center"
+	<button bottom="-294" follows="left|top" font="SansSerifSmall" halign="center"
 	     height="20" label="More &gt;&gt;" left="10"
 	     mouse_opaque="true" name="more_btn" scale_image="TRUE"
 	     tool_tip="Advanced Options" width="80" />
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -130,7 +130,7 @@
 			function="BuildTool.commitRadioEdit"/>
 	</check_box>
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
+	    initial_value="false" label="Select Face" left="4" mouse_opaque="true"
 	    name="radio select face" radio_style="true" width="114" >
 	    <check_box.commit_callback
 			function="BuildTool.commitRadioEdit"/>
--- a/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -585,6 +585,40 @@
 			     name="DrawClassicClouds" width="200" />
 			<button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?"
 			     left="608" name="WLClassicCloudsHelp" width="18" />
+ <text
+  name="cloud_settings_title"
+  follows="top|left"
+  height="16"
+  left="480"
+  bottom_delta="-17"
+  width="76">
+          Cloud Setting
+  </text>
+  <combo_box
+   follows="top|left"
+   control_name="AlchemyWLCloudTexture"
+   name="cloud_settings_preset_combo"
+   left_delta="76"
+   bottom_delta="2"
+   height="14"
+   width="110">
+      <combo_box.item
+       label="Altocumulus"
+       name="altocumulus_cloud"
+       value="Altocumulus.tga"/>
+      <combo_box.item
+       label="Cumulo-Nimbus"
+       name="cumulonimbus_cloud"
+       value="Cumulo-Nimbus.tga"/>
+      <combo_box.item
+       label="Default"
+       name="default_cloud"
+       value="Default.tga"/>
+      <combo_box.item
+       label="Layered"
+       name="layered_cloud"
+       value="Layered.tga"/>
+  </combo_box>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -578,6 +578,10 @@
 				<on_check control="AutoresponseMuted"/>
 			</menu_item_check>
 		</menu>
+		<menu_item_check label="Sit when away" name="Sit when away">
+			<on_click function="ToggleControl" userdata="AlchemySitOnAway" />
+			<on_check control="AlchemySitOnAway" />
+		</menu_item_check>
      </menu>
 		<menu_item_call bottom="-281" enabled="false" height="19" label="Stop Animating My Avatar" left="0"
 		     mouse_opaque="true" name="Stop Animating My Avatar" width="250">
@@ -1071,10 +1075,6 @@
 			<on_click function="ToggleControl" userdata="Nimble"/>
 			<on_check control="Nimble"/>
 		</menu_item_check>
-		<menu_item_check label="Phantom" mouse_opaque="true" name="Phantom">
-			<on_click function="ToggleControl" userdata="Phantom"/>
-			<on_check control="Phantom"/>
-		</menu_item_check>
 		<menu_item_separator mouse_opaque="true" name="separators3"/>
 		<menu_item_check label="Region Tracker" name="Region Tracker">
 			<on_click function="ShowFloater" userdata="region_tracker"/>
--- a/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -68,7 +68,7 @@ Hover your mouse over the options for more help.
 	     left_delta="0" mouse_opaque="true" name="info_button" width="106" />
 	<button bottom_delta="0" follows="left|top" height="22" label="" left_delta="106"  width="22" scale_image="true" image_selected="tool_zoom.tga" image_unselected="tool_zoom.tga" image_hover_selected="tool_zoom_active.tga" image_hover_unselected="tool_zoom_active.tga" name="bigimg"/>
 	<text bottom_delta="-16" left_delta="-106" font="SansSerif" name="text_owners_and_visible_members">
-		Owners &amp; Visible Members
+		Owners &amp; Visible Members ([COUNT])
 	</text>
 	<text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
 	     name="text_owners_are_shown_in_bold">
--- a/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -80,9 +80,7 @@ execute the Ability.
 			     border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
 			     height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
 			     name="filter_input" width="100" />
-			<button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
-			     label="Search" left_delta="105" name="search_button" width="60" />
-			<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
+			<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-123"
 			     column_padding="0" draw_border="true" draw_heading="true"
 			     heading_font="SansSerifSmall" menu_num="0" name_system="GroupMembersNameSystem"
 			     heading_height="14" height="120" left="4" multi_select="true"
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -91,7 +91,8 @@
      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" follows="top" initial_value="true" label="Broadcast Viewer Effects (does not affect pointat and lookat)" left="10" name="broadcast_viewer_effects" width="400"/>
      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" follows="top" initial_value="true" label="Disable Point At And Beam" tool_tip="Don't point at or show your edit beam when selecting an object." name="disable_point_at_and_beams_check"/>
      <check_box bottom_delta="-20" control_name="PrivateLookAt" follows="top" initial_value="false" label="Do not Look At objects and/or avatars" tool_tip="Disables headturns and lookat beacons, causing your avatar to look straight ahead (unless scripted to do otherwise)." name="private_look_at_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowLookAt" follows="top" initial_value="false" label="Show others' LookAt beacons" tool_tip="Shows you where others are looking." name="show_look_at_check"/>
+      <check_box bottom_delta="-20" control_name="AlchemyLookAtHideSelf" follows="top" initial_value="false" label="Don't show me my LookAt beacon" tool_tip="Don't show me my own camera crosshairs" name="LookAtHideOwn"/>
+      <check_box bottom_delta="-20" control_name="AscentShowLookAt" follows="top" initial_value="false" label="Show LookAt beacons" tool_tip="Shows you where people are looking." name="show_look_at_check"/>
      <combo_box bottom_delta="-1" left_delta="200" follows="top" height="18" control_name="LookAtNameSystem" name="lookat_namesystem_combobox" width="130" tool_tip="Style for displaying names on LookAt beacons">
        <combo_item name="No Names" value="-1">No Names</combo_item>
        <combo_item name="Old Names" value="0">Old Names</combo_item>
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -9,7 +9,7 @@
 	<check_box bottom="-85" height="16" initial_value="false" label="Show timestamps in IM" name="show_timestamps_check"/>
    <check_box bottom="-105" height="16" initial_value="false" label="Show online Friend notifications" name="friends_online_notify_checkbox"/>
    <text bottom_delta="-15" follows="top|left" left_delta="4" name="conference_block_text">Incoming conferences:</text>
-    <radio_group follows="top|left" bottom_delta="-21" left_delta="116" height="16" width="350" draw_border="false" control_name="LiruBlockConferences" name="block_conferences_radio">
+    <radio_group follows="top|left" bottom_delta="-6" left_delta="116" height="16" width="204" draw_border="true" control_name="LiruBlockConferences" name="block_conferences_radio">
      <radio_item bottom_delta="0" name="accept" width="30" value="0">Accept</radio_item>
      <radio_item bottom_delta="0" left_delta="30" name="friends only" width="44" value="2">Friends Only</radio_item>
      <radio_item bottom_delta="0" left_delta="44" name="block" width="30" value="1">Block</radio_item>
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -4161,6 +4161,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Unnamed">(Unnamed)</string>
 	<string name="inventory_item_offered_to">Inventory item offered to</string>
 	<string name="Saved_message" value="(Saved [LONG_TIMESTAMP]) "/>
+	<string name="IM_unblock_only_groups_friends">To see this message, you must uncheck &apos;Only friends and groups can call or IM me&apos; in Preferences/Privacy.</string>
 	<string name="StartPointSet">Start point set</string>
 	<string name="EndPointSet">End point set</string>
 	<string name="MeasuredDistance">Distance: [DIST]</string>
--- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
@@ -59,6 +59,6 @@ agregues un paso de espera.
 	<check_box height="20" label="tiempo en segundos" name="wait_time_check"/>
 	<line_editor left_delta="125" name="wait_time_editor"/>
 	<check_box label="Activa" name="active_check" tool_tip="Los Gestos activos pueden ser disparados en el chat por sus frases disparadoras o pulsando sus teclas de acceso rápido. Los Gestos, por lo general, se vuelven inactivas cuando hay un conflicto en la combinación de teclas."/>
-	<button label="Vista Previa" name="preview_btn"/>
+	<flyout_button label="Vista Previa" name="preview_btn"/>
 	<button label="Guardar" name="save_btn"/>
 </floater>
--- a/indra/newview/skins/default/xui/es/floater_radar.xml
+++ b/indra/newview/skins/default/xui/es/floater_radar.xml
@@ -58,20 +58,6 @@
 		<!-- =============================== -->
 		<panel label="Opciones" name="options_tab">
 			<check_box label="Actualizar" name="update_enabled_cb" tool_tip="Definir cuando debe ser actualizada la lista de avatares"/>
-			<text name="rate">
-					Frec.:
-			</text>
-			<radio_group name="update_rate" tool_tip="Frecuencia de actualización del radar (consume mas FPS cuando es alta)">
-				<radio_item name="high">
-					Alta
-				</radio_item>
-				<radio_item name="medium">
-					Media
-				</radio_item>
-				<radio_item name="low">
-					Baja
-				</radio_item>
-			</radio_group>
 			<check_box label="Anunciar aún estando cerrado" name="keep_open" tool_tip="Oculta el radar en vez de cerrarlo para seguir enviando los avisos al chat" />
 			<check_box label="Anunciar keys al HUD" name="radar_chat_keys" tool_tip="Definir cuando enviar las keys de los avarares a los scritps LSL" />
 			<button name="send_keys_btn" label="Anunciar Ahora" tool_tip="Envia todas las keys al HUD ahora"/>
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -6,20 +6,20 @@
 	<text name="type_label">
 		Destino
 	</text>
-	<radio_group label="Tipo de foto" name="snapshot_type_radio">
-		<radio_item name="feed">
+	<combo_box name="snapshot_type_radio">
+		<combo_item name="feed">
 			Publicar en my.secondlife.com
-		</radio_item>	
-		<radio_item name="postcard">
+		</combo_item>
+		<combo_item name="postcard">
 			Enviar por Email
-		</radio_item>
-		<radio_item name="texture">
-			Guardarla en tu inventario ([UPLOADFEE])
-		</radio_item>
-		<radio_item name="local">
+		</combo_item>
+		<combo_item name="texture">
+			Guardarla en tu inventario
+		</combo_item>
+		<combo_item name="local">
 			Guardarla en disco duro
-		</radio_item>
-	</radio_group>
+		</combo_item>
+	</combo_box>
 	<button label="Actualizar foto" name="new_snapshot_btn"/>
 	<button label="Congelar" name="freeze_time_btn" tool_tip="Congelar la imagen y mostrar la vista previa en pantalla completa. Permite mover la cámara por la escena congelada y tomar múltiples fotos de la misma. ¡Presiona ESC para deshacer!" />
 	<button label="Publicar" name="feed_btn"/>	
@@ -160,4 +160,4 @@
 		Aspecto Resolución y Destino
 	</string>	
 </floater>
- 
+
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -34,7 +34,7 @@ Coloca el cursor sobre las opciones para más información.
 	<button label="Entrar ([CURRENCY]0)" label_selected="Entrar ([CURRENCY]0)" name="join_button"/>
 	<button label="Ver Detalles" label_selected="Ver Detalles" name="info_button"/>
 	<text name="text_owners_and_visible_members">
-		Propietarios y Miembros Visibles
+		Propietarios y Miembros Visibles ([COUNT])
 	</text>
 	<text name="text_owners_are_shown_in_bold">
 		(Los Propietarios aparecen en Negrita)
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -61,6 +61,6 @@ ajoutez des pauses.
 	<line_editor left_delta="130" name="wait_time_editor"/>
 	<check_box label="Actifs" name="active_check"
 	     tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leurs raccourcis dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu'il y a un conflit entre les raccourcis."/>
-	<button label="Prévisualiser" name="preview_btn" width="86"/>
+	<flyout_button label="Prévisualiser" name="preview_btn" width="86"/>
 	<button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
 </floater>
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -3,20 +3,20 @@
 	<text name="type_label">
 		Destination de la photo
 	</text>
-	<radio_group label="Type de photo" name="snapshot_type_radio" width="228">
-		<radio_item name="feed">
+	<combo_box name="snapshot_type_radio" width="228">
+		<combo_item name="feed">
 			Poster sur my.secondlife.com
-		</radio_item>
-		<radio_item name="postcard">
+		</combo_item>
+		<combo_item name="postcard">
 			Envoyez par e-mail
-		</radio_item>
-		<radio_item name="texture">
-			Enregistrez dans votre inventaire ([UPLOADFEE])
-		</radio_item>
-		<radio_item name="local">
+		</combo_item>
+		<combo_item name="texture">
+			Enregistrez dans votre inventaire
+		</combo_item>
+		<combo_item name="local">
 			Enregistrez sur votre disque dur
-		</radio_item>
-	</radio_group>
+		</combo_item>
+	</combo_box>
 	<button label="Plus &gt;&gt;" name="more_btn" tool_tip="Options avancées"/>
 	<button label="&lt;&lt; Moins" name="less_btn" tool_tip="Options avancées"/>
 	<text name="type_label2">
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -52,7 +52,7 @@
 	     height="22" label="Detailed View" label_selected="Detailed View"
 	     left_delta="0" mouse_opaque="true" name="info_button" width="128" />
 	<text bottom_delta="-16" font="SansSerif" name="text_owners_and_visible_members">
-		Propri&#xE9;taires et membres visibles
+		Propri&#xE9;taires et membres visibles ([COUNT])
 	</text>
 	<text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
 	     name="text_owners_are_shown_in_bold">
--- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
@@ -57,6 +57,6 @@ non aggiunga pause.
 	<check_box label="tempo in secondi" name="wait_time_check"/>
 	<line_editor left_delta="114" name="wait_time_editor" />
 	<check_box label="Attiva" name="active_check" tool_tip="Le gesture attivate possono essere eseguite scrivendo in chat la parola chiave o premendo i tasti chiave. Le gesture generalmente si disattivano quando c&apos;è un conflitto nei relativi tasti."/>
-	<button label="Anteprima" name="preview_btn"/>
+	<flyout_button label="Anteprima" name="preview_btn"/>
 	<button label="Salva" name="save_btn"/>
 </floater>
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -3,17 +3,17 @@
 	<text name="type_label">
 		Destinazione della fotografia
 	</text>
-	<radio_group label="Tipo di fotografia" name="snapshot_type_radio" width="228">
-		<radio_item name="postcard">
+	<combo_box name="snapshot_type_radio" width="228">
+		<combo_item name="postcard">
 			Invia via email
-		</radio_item>
-		<radio_item name="texture">
-			Salva nel tuo inventario ([UPLOADFEE])
-		</radio_item>
-		<radio_item name="local">
+		</combo_item>
+		<combo_item name="texture">
+			Salva nel tuo inventario
+		</combo_item>
+		<combo_item name="local">
 			Salva sul tuo disco rigido
-		</radio_item>
-	</radio_group>
+		</combo_item>
+	</combo_box>
 	<text name="file_size_label">
 		Grandezza del file: [SIZE] KB
 	</text>
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -14,7 +14,7 @@
 	<check_box label="Posizione" name="radio position"/>
 	<check_box label="Ruota (Ctrl)" name="radio rotate"/>
 	<check_box label="Ridimensiona (Ctrl-Shift)" name="radio stretch"/>
-	<check_box label="Seleziona Texture" name="radio select face"/>
+	<check_box label="Seleziona faccia" name="radio select face"/>
 	<check_box label="Modifica parti unite" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
 		Modalità:
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
@@ -31,7 +31,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
 	<button label="Unisciti (0 [CURRENCY])" label_selected="Unisciti (0 [CURRENCY])" name="join_button"/>
 	<button label="Visualizza dettagli" label_selected="Visualizza dettagli" name="info_button"/>
 	<text name="text_owners_and_visible_members">
-		Proprietari &amp; Membri visibili
+		Proprietari &amp; Membri visibili ([COUNT])
 	</text>
 	<text name="text_owners_are_shown_in_bold">
 		(I proprietari sono scritti in neretto)
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -58,6 +58,6 @@ você inclua passos de espera.
 	<check_box bottom_delta="-30" label="tempo em segundos" name="wait_time_check"/>
 	<line_editor left_delta="130" name="wait_time_editor" />
 	<check_box label="Ativar" name="active_check" tool_tip="Gestos ativos podem ser gatilhados escrevendo suas frases de gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
-	<button label="Prévia" name="preview_btn"/>
+	<flyout_button label="Prévia" name="preview_btn"/>
 	<button label="Salvar" name="save_btn"/>
 </floater>
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -3,17 +3,17 @@
 	<text name="type_label">
 		Destino da foto
 	</text>
-	<radio_group label="Tipo de Foto" name="snapshot_type_radio">
-		<radio_item name="postcard">
+	<combo_box name="snapshot_type_radio">
+		<combo_item name="postcard">
 			Enviar por email
-		</radio_item>
-		<radio_item name="texture">
-			Salvar no seu inventário ([UPLOADFEE])
-		</radio_item>
-		<radio_item name="local">
+		</combo_item>
+		<combo_item name="texture">
+			Salvar no seu inventário
+		</combo_item>
+		<combo_item name="local">
 			Salvar no seu disco rígido
-		</radio_item>
-	</radio_group>
+		</combo_item>
+	</combo_box>
 	<text name="file_size_label">
 		Tamanho do arquivo: [SIZE] KB
 	</text>
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -25,7 +25,7 @@
 	<check_box label="Posição" name="radio position"/>
 	<check_box label="Rotacionar (Ctrl)" name="radio rotate"/>
 	<check_box label="Esticar (Ctrl-Shift)" name="radio stretch"/>
-	<check_box label="Selecionar Textura" name="radio select face"/>
+	<check_box label="Selecionar face" name="radio select face"/>
 	<check_box label="Editar partes unidas" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
 		Régua:
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -27,7 +27,7 @@
 	<button label="Unir ([CURRENCY]0)" label_selected="Unir ([CURRENCY]0)" name="join_button"/>
 	<button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
 	<text name="text_owners_and_visible_members">
-		Proprietários &amp; Membros visíveis
+		Proprietários &amp; Membros visíveis ([COUNT])
 	</text>
 	<text name="text_owners_are_shown_in_bold">
 		(Proprietários são mostrados em negrito )