Merge branch 'master' of https://github.com/singularity-viewer/Singul…

…arityViewer.git

autobuild.xml

@@ -410,11 +410,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4614b29cc98021cf1770a8290171602b</string>
+              <string>a96fda7ad5cee967823f5c94390ba35b</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/crashpad/windows/crashpad-ce32d093.7-windows-7.tar.bz2</string>
+              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/crashpad/windows/crashpad-c6d76a90.194-windows-194.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -424,18 +424,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d801461b7a6a40fffab828aa1e01e3e6</string>
+              <string>5ff95ca1007ed2dc300b59de17453201</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/crashpad/windows64/crashpad-ce32d093.7-windows64-7.tar.bz2</string>
+              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/crashpad/windows64/crashpad-c6d76a90.194-windows64-194.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>ce32d093.7</string>
+        <string>c6d76a90.194</string>
       </map>
       <key>curl</key>
       <map>

indra/newview/VIEWER_VERSION.txt

@@ -1 +1 @@
-1.8.7
+1.8.9

indra/newview/skins/default/xui/en-us/floater_experienceprofile.xml

@@ -75,6 +75,7 @@
           width="315"
           min_width="315">
           <layout_stack
+            name="Experience_profile"
             follows="all"
             height="550"
             left="0"
@@ -151,7 +152,7 @@
                 bottom="-50"
                 value=""
                 width="305"
-				max_length="2048"/>
+                max_length="2048"/>
             </layout_panel>
             <layout_panel
               follows=""
@@ -256,6 +257,7 @@
               </text_editor>
             </layout_panel>
             <layout_panel
+              name ="owner panel"
               follows="left|top|right"
               height="18"
               left="0"

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -9950,7 +9950,7 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra
    name="NoPermsNoRemoval"
    type="notify">
    <tag>fail</tag>
-Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
+Removal of the object '[OBJ_NAME]' from the region is disallowed by the permissions system.
   </notification>
 
   <notification
@@ -10221,7 +10221,7 @@ Unable to add script!
    name="AssetServerTimeoutObjReturn"
    type="notify">
    <tag>fail</tag>
-Asset server didn't respond in a timely fashion.  Object returned to sim.
+Asset server didn't respond in a timely fashion.  Object returned to region.
   </notification>
 
   <notification
@@ -11694,7 +11694,7 @@ Media/audio URL blocked for [DOMAIN]
    name="RadarChatKeysRequest"
    type="alertmodal">
 An object owned by you has requested keys from your radar.
-Would you like to enable announcing keys to objects in the sim?
+Would you like to enable announcing keys to objects in the region?
     <usetemplate
      name="yesnocancelbuttons"
      yestext="Yes"

indra/newview/skins/default/xui/en-us/panel_experience_log.xml

@@ -14,13 +14,15 @@
     name="loading"
     value="loading..."/>
   <layout_stack
+	 name="experience_panel"
     top="0"
     left="4" 
     right="-1"
     bottom="-4"
     orientation="vertical"
     follows="all">
     <layout_panel
+		name="event_panel"
       bottom="0"
       left="1"
       right="-1"

indra/newview/skins/default/xui/en-us/panel_experience_search.xml

@@ -5,6 +5,7 @@
   left="0"
   width="350"
   height="330"
+  name="panel_experiences_search"
   label="Search"
   follows="all">
 
@@ -44,6 +45,7 @@
     height="330"
     name="search_panel">
     <text
+		name="search_text"
       left="0"
       follows="top|left|right"
       right="-1">
@@ -63,6 +65,7 @@
             height="18"
             name="find"/>
     <text
+		name="content_text"
       bottom_delta="-18"
       left="0"
       follows="top|left"

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml

@@ -4,7 +4,7 @@
     <panel border="true" left="1" bottom="-190" height="180" width="500" label="Main" name="General">
       <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" follows="top" height="16" initial_value="true" label="Where applicable, save Vanity settings per-account." left="10" tool_tip="Saves settings per-account, allowing easier customization for alts." name="use_account_settings_check"/>
       <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Hide the Teleport progress screens" tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs." name="disable_tp_screen_check"/>
-      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Play the Teleport sound when moving between sims" tool_tip="Viewer will play the wooshing TP noise on teleport." name="tp_sound_check"/>
+      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Play the Teleport sound when teleporting between regions" tool_tip="Viewer will play the wooshing TP noise on teleport." name="tp_sound_check"/>
       <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" follows="top" height="16" initial_value="true" label="Hide the Login/Logout progress screens" tool_tip="If checked, the viewer will hide the login/logout progress screen." name="disable_logout_screen_check"/>
       <check_box bottom_delta="-20" control_name="SGDisableChatAnimation" follows="top" height="16" initial_value="false" label="Disable chat, whisper and shout animations" tool_tip="Remove chat animations from your own avatar. Effect visible to everyone" name="disable_chat_animation"/>
       <check_box bottom_delta="-20" control_name="LiruAddNotReplace" follows="top" height="16" label="Add attachments and wearables instead of replacing them" tool_tip="When double clicking or pressing enter in inventory with wearables or objects selected they will be added to your outfit, instead of replacing the wearable or object currently at their target destination." name="add_not_replace"/>

indra/newview/skins/default/xui/en-us/strings.xml

@@ -3252,7 +3252,7 @@ Where tag = tag string to match.  Removes bot's matching the tag.
     <string name="has_left">has left</string>
     <string name="has_left_flood">is now off the radar for</string>
     <!-- [RANGE] -->
-    <string name="the_sim">the sim</string>
+    <string name="the_sim">the region</string>
     <string name="draw_distance">draw distance</string>
     <string name="shout_range">shout range</string>
     <string name="chat_range">chat range</string>

indra/newview/skins/default/xui/es/floater_active_speakers.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="active_speakers" title="Participantes Activos">
   <layout_stack name="active_speakers_stack">
-		<layout_panel name="panel_voice_effect"/>
 		<layout_panel name="active_speakers_panel">
 			<name_list name="speakers_list">
 				<column label="Nombre" name="speaker_name"/>
 				<column label="" name="speaking_status"/>
 			</name_list>
-			<slider name="speaker_volume"/>
 			<button name="mute_btn" tool_tip="Ignorar la voz de este residente"/>
 		</layout_panel>
 	</layout_stack>

indra/newview/skins/default/xui/es/floater_area_search.xml

@@ -22,6 +22,8 @@
 		<column name="Owner" label="Propietario" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
 		<column name="Group" label="Grupo" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
 	</scroll_list>
+	<button name="TP" label="TP"/>
+	<button name="Look" label="Ver"/>
 	<text name="counter">
 		Listados/Pendientes/Total
 	</text>

indra/newview/skins/default/xui/es/floater_avatar_picker.xml

@@ -24,17 +24,14 @@
 			<text name="InstructSearchResidentName">
 				Escribe parte del nombre del residente:
 			</text>
-			<line_editor name="Edit"/>			
 			<button label="Buscar" label_selected="Buscar" name="Find"/>
-			<scroll_list name="SearchResults"/>
 		</panel>
 		<!-- ========================= -->		
 		<panel name="FriendsPanel" label="Amigos">
 			<text name="InstructSelectFriend">
 				Elige a una persona:
 			</text>
 			<button label="Actualizar Lista" label_selected="Actualizar Lista" name="RefreshFriends" left_delta="15" width="100"/>
-			<scroll_list name="Friends"/>
 		</panel>
 		<!-- ========================= -->		
 		<panel name="NearMePanel" label="Cercanos">
@@ -46,14 +43,12 @@
 			<text name="meters">
 				Metros
 			</text>
-			<scroll_list name="NearMe"/>
 		</panel>
 		<!-- ========================= -->		
 		<panel name="KeyPanel" label="Por UUID" >
 			<text name="InstructSelectResident">
 				UUID del Avatar o Grupo:
 			</text>
-			<line_editor name="EditUUID"/>
 		</panel>
 	</tab_container>
 	<button label="Aceptar" label_selected="Aceptar" name="ok_btn"/>

indra/newview/skins/default/xui/es/floater_experience_search.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="experiencepicker" title="Seleccionar Experiencia">
+</floater>

indra/newview/skins/default/xui/es/floater_experienceprofile.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater title="Perfil de la Experiencia">
+	<floater.string name="empty_slurl">
+		(ninguno)
+	</floater.string>
+	<floater.string name="maturity_icon_general">
+		map_event.tga
+	</floater.string>
+	<floater.string name="maturity_icon_moderate">
+		map_event_mature.tga
+	</floater.string>
+	<floater.string name="maturity_icon_adult">
+		map_event_adult.tga
+	</floater.string>
+	<name_box name="experience_title"/>
+	<tab_container  name="tab_container">
+		<panel name="panel_experience_info">
+			<scroll_container name="xp_scroll">
+				<panel name="scrolling_panel">
+					<layout_stack name="Experience_profile">
+						<layout_panel name="top panel">
+							<text name="grid_wide"/>
+							<button label="Editar" name="edit_btn"/>
+						</layout_panel>
+						<layout_panel name="image_panel">
+							<texture_picker name="logo"/>
+						</layout_panel>
+						<layout_panel name="description panel">
+							<text_editor name="experience_description"/>
+						</layout_panel>
+						<layout_panel name="maturity panel">
+							<text name="ContentRating" width="75">
+								Contenido:
+							</text>
+							<text name="ContentRatingText"/>
+						</layout_panel>
+						<layout_panel name="location panel">
+							<text name="Location" width="290">
+								Ubicación:
+							</text>
+							<text_editor name="LocationTextText"/>
+						</layout_panel>
+						<layout_panel name="marketplace panel">
+							<text name="marketplace store">
+								Tienda del Mercado:
+							</text>
+							<text_editor name="marketplace"/>
+						</layout_panel>
+						<layout_panel name ="owner panel">
+							<text name="Owner">
+								Propietario:
+							</text>
+							<name_box name="OwnerText"/>
+						</layout_panel>
+						<layout_panel name="group_panel">
+							<text name="Group">
+								Grupo:
+							</text>
+							<name_box name="GroupText"/>
+						</layout_panel>
+						<layout_panel name="perm panel">
+							<button label="Permitir" name="allow_btn"/>
+							<button label="Olvidar" name="forget_btn"/>
+							<button label="Bloquear" name="block_btn"/>
+							<text name="privileged">
+								Esta experiencia está habilitada para todos los residentes.
+							</text>
+							<button label="Denunciar Infracción" name="report_btn" left="84" width="134"/>
+						</layout_panel>
+					</layout_stack>
+				</panel>
+			</scroll_container>
+		</panel>
+		<panel name="edit_panel_experience_info">
+			<scroll_container name="edit_xp_scroll" >
+				<panel name="edit_scrolling_panel">
+					<texture_picker name="edit_logo"/>
+					<text name="edit_experience_title_label" value="Nombre:"/>
+					<line_editor name="edit_experience_title"/>
+					<text name="edit_experience_desc_label" value="Descripción:"/>
+					<text_editor name="edit_experience_description"/>
+					<button name="Group_btn" label="Definir Grupo"/>
+					<name_box name="edit_GroupText"/>
+					<text name="edit_ContentRating">
+						Contenido:
+					</text>
+					<combo_box label="Moderado" tool_tip="Increasing the maturity rating on an experience will reset permission for all residents which have allowed the experience." name="edit_ContentRatingText">
+						<combo_item label="Adulto" name="Adult"/>
+						<combo_item label="Moderado" name="Mature"/>
+						<combo_item label="General" name="PG"/>
+					</combo_box>
+					<text name="edit_Location">
+						Ubicación:
+					</text>
+					<text_editor name="edit_LocationTextText"/>
+					<button name="location_btn" label="Definir aquí"/>
+					<button name="clear_btn" label="Limpiar Ubicación"/>
+					<text name="Marketplace Store text">
+						Tienda del Mercado:
+					</text>
+					<line_editor name="edit_marketplace"/>
+					<check_box tool_tip="" label="Habilitar Experiencia" name="edit_enable_btn"/>
+					<check_box label="Ocultar en Búsqueda" name="edit_private_btn"/>
+					<text name="changes" value="Los cambios de una experiencia pueden tardar varios minutos en mostrarse en todas las regiones."/>
+					<button label="Volver" name="cancel_btn"/>
+					<button label="Guardar" name="save_btn"/>
+				</panel>
+			</scroll_container>
+		</panel>
+	</tab_container>
+</floater>
+

indra/newview/skins/default/xui/es/floater_experiences.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater name="floater_experiences" title="Experiencias">
+</floater>

indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml

@@ -24,6 +24,9 @@
 	<text name="LabelAcquiredDate">
 		Mie May 24 12:50:46 2006
 	</text>
+	<text name="LabelItemExperienceTitle" >
+        Experiencia:
+	</text>
 	<text name="OwnerLabel">
 		Puedes:
 	</text>
@@ -80,6 +83,7 @@
 		Precio:  [CURRENCY]
 	</text>
 	<line_editor name="Edit Cost"/>
+    <floater.string name="loading_experience">(cargando)</floater.string>
 	<string name="unknown">
 		(desconocido)
 	</string>

indra/newview/skins/default/xui/es/floater_live_lsleditor.xml

@@ -3,6 +3,7 @@
 	<button label="Restablecer" label_selected="Restablecer" name="Reset"/>
 	<check_box label="Ejecutándose" name="running"/>
 	<check_box label="Mono" name="mono"/>
+    <check_box label="Usar Experiencia" name="enable_xp" />
 	<string name="not_allowed">
 		No tienes permiso para ver este script.
 	</string>

indra/newview/skins/default/xui/es/floater_tools.xml

@@ -4,6 +4,10 @@
     <floater.string name="status_selectcount">
         Primitivas: [OBJ_COUNT], LI: [LAND_IMPACT]
     </floater.string>
+    <string name="Selected Face:" value="Cara Seleccionada:"/>
+    <string name="Link number:" value="Enlace Nro.:"/>
+    <string name="Selected prims:" value="Prim Seleccionado:"/>
+    <string name="Selected objects:" value="Objetos Seleccionados:"/>
     <floater.string
      name="status_remaining_capacity">
         Capacidad remanente [LAND_CAPACITY].

indra/newview/skins/default/xui/es/menu_experiences.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Avatar Menu">
+	<menu_item_call label="Perfil" name="Profile"/>
+	<menu_item_call label="Permitir" name="Allow"/>
+	<menu_item_call label="Olvidar" name="Forget"/>
+	<menu_item_call label="Bloquear" name="Block"/>
+	<menu_item_call label="Denunciar" name="Report"/>
+	<menu_item_call label="Copiar SLURL al portapapeles" name="url_copy"/>
+	<menu_item_call label="Copiar UUID al portapapeles" name="key_copy"/>
+	<menu_item_call label="Copiar Nombre al portapapeles" name="name_copy"/>
+</menu>

indra/newview/skins/default/xui/es/menu_groups_list.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu label="Grupos" name="groups_menu">
+	<menu_item_call label="Mostrar Información del Grupo" name="show_group"/>
+	<menu_item_call label="Abrir chat del grupo" name="im_group"/>
+	<menu_item_call label="Abrir chat del Grupo" name="call_group"/>
+	<menu_item_call label="Activar Grupo" name="activate_group"/>
+	<menu_item_call label="Historial de chat" name="Chat History"/>
+	<menu_item_call label="Unirse al Grupo" name="join_group"/>
+	<menu_item_call label="Abandonar el Grupo" name="leave_group"/>
+	<menu_item_call label="Copiar Nombre" name="copy_name"/>
+	<menu_item_call label="Copiar SLURL" name="copy_url"/>
+	<menu_item_call label="Copiar UUID" name="copy_key"/>
+</menu>