LLAvatarActions all hooked up!

Rlva style~ So update to RLVa stuff! Adds support for @startim and @startimto Enables hasOpenIM and hasOpenProfile, Yay functionality! RLV_BHVR_STARTIM and RLV_BHVR_STARTIMTO added While I was working, I was updating LLAgentHandler, after long enough it was identical enough to the one in llpanelprofile, so we're using that now. Cleans up llfloateravatarinfo to the point of being a floater and instancetracker wrapper for a panelavatar (profile panel) Bypasses looking up expired names that we know via get, this should avoid chats (and profiles, but that bug never got out) never opening for people we already know the name of on a bad connection; of course, this will only cause a faster reaction on the UI's part, messages may never get sent still (and profiles may never load) if the connection is truly terrible. Cleans up llfloaterfriends and some parts of llfloateravatarlist (avatarlist could be cleaned up more from this perhaps in the future) May slightly look better with copy detection and without space changes.. llgivemoney.cpp changes fix up some dummy view warnings I noticed while testing these changes llpreview.cpp changes avoid segfault caused by llfloateravatarinfo not being a preview anymore but being inside a multipreview nonetheless. Translators, don't worry, I covered this one with updates from v3 (Except German team)
2013-05-29 23:56:33 -04:00
parent 6ef3ba4e11
commit c701c61566
65 changed files with 1264 additions and 1330 deletions
--- a/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -157,9 +157,6 @@
 			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
 			     visible="false" width="95" />
-			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
-			     mouse_opaque="true" name="Place an Ad..." width="145" />
 			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
 			     height="20" label="Delete" label_selected="Delete" left="80"
 			     mouse_opaque="true" name="Delete" width="80" />
--- a/indra/newview/skins/default/xui/en-us/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory2.xml
@@ -134,9 +134,6 @@
 			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
 			     visible="false" width="95" />
-			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
-			     mouse_opaque="true" name="Place an Ad..." width="145" />
 			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
 			     height="20" label="Delete" label_selected="Delete" left="80"
 			     mouse_opaque="true" name="Delete" width="80" />
--- a/indra/newview/skins/default/xui/en-us/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
@@ -216,9 +216,6 @@
 			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
 			     visible="false" width="95" />
-			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
-			     mouse_opaque="true" name="Place an Ad..." width="145" />
 			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
 			     height="20" label="Delete" label_selected="Delete" left="80"
 			     mouse_opaque="true" name="Delete" width="80" />
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -2352,20 +2352,6 @@ Unable to buy land for the group:
 You do not have permission to buy land for your active group.
  </notification>

-  <notification
-   icon="alertmodal.tga"
-   label="Add Friend"
-   name="AddFriend"
-   type="alertmodal">
-Friends can give permissions to track each other on the map and receive online status updates.
-
-Offer friendship to [NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
  <notification
   icon="alertmodal.tga"
   label="Add Friend"
@@ -6660,6 +6646,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    </form>
  </notification>

+  <notification
+   icon="notify.tga"
+   name="FriendshipOffered"
+   type="notifytip">
+	You have offered friendship to [TO_NAME]
+  </notification>
+
  <notification
   icon="notify.tga"
   name="OfferFriendshipNoMessage"
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -57,14 +57,9 @@
 			     mouse_opaque="true" name="Name:" v_pad="0" width="70">
        Name:
      </text>
-      <name_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom="-48" enabled="false" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
-			     max_length="254" mouse_opaque="false" name="name"
-			     width="180" visible="false" />
 			<line_editor bevel_style="in" border_style="line"
 				 border_thickness="1" bottom="-48" enabled="false" follows="left|top"
-				 font="SansSerifSmall" height="16" is_unicode="false" left_delta="0"
+				 font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
 				 max_length="254" mouse_opaque="false" name="dnname"
 				 width="180" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3273,6 +3273,10 @@ The
 	<string name="Region">Region</string>
 	<string name="RegionSettings">Region Settings</string>

+	<!-- Multi Preview Floater -->
+	<string name="MultiPreviewTitle">Preview</string>
+	<string name="MultiPropertiesTitle">Properties</string>
+
 	<!-- inventory offer -->
 	<string name="InvOfferAnObjectNamed">An object named</string>
 	<string name="InvOfferOwnedByGroup">owned by the group</string>
@@ -4015,6 +4019,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
  <string name="answering-im">
    Connecting...
  </string>
+  <string name="conference-title">
+    Multi-person chat
+  </string>
  <string name="inventory_item_offered-im">
    Inventory item offered
  </string>
@@ -4247,6 +4254,8 @@ Try enclosing path to the editor with double quotes.
  <string name="BeaconMedia">Viewing media beacons (white)</string>
  <string name="ParticleHiding">Hiding Particles</string>

+  <string name="Command_Profile_Label">Profile</string>
+
  <!-- Pathfinding -->
  <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
  <string name="Pathfinding_Object_Attr_None">None</string>
--- a/indra/newview/skins/default/xui/es/floater_directory.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory.xml
@@ -102,7 +102,6 @@
 			</combo_box>
 			<button label="Navegar" label_selected="Navegar" name="Browse"/>
 			<button label="Buscar" label_selected="Buscar" name="Search"/>
-			<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
 			<button label="Borrar" label_selected="Borrar" name="Delete"/>
 			<scroll_list name="results">
 				<column label="Nombre" name="name"/>
--- a/indra/newview/skins/default/xui/es/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory2.xml
@@ -80,7 +80,6 @@
 			</combo_box>
 			<button label="Navegar" label_selected="Navegar" name="Browse"/>
 			<button label="Buscar" label_selected="Buscar" name="Search"/>
-			<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
 			<button label="Borrar" label_selected="Borrar" name="Delete"/>
 			<scroll_list name="results">
 				<column label="" name="icon"/>
--- a/indra/newview/skins/default/xui/es/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory3.xml
@@ -129,7 +129,6 @@
 			</combo_box>
 			<button label="Navegar" label_selected="Navegar" name="Browse"/>
 			<button label="Buscar" label_selected="Buscar" name="Search"/>
-			<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
 			<button label="Borrar" label_selected="Borrar" name="Delete"/>
 			<scroll_list name="results">
 				<column label="" name="icon"/>
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -1384,13 +1384,6 @@ Aún puedes ver el chat y los MI existentes pulsando &apos;Ver MI y Chat&apos;.
 No tienes el permiso de comprar terreno para el grupo que tienes activado actualmente.
 	</notification>
 	
-	<notification label="Añadir como amigo" name="AddFriend">
-		Los amigos pueden darse permiso para localizarse en el mapa y para saber si el otro está conectado.
-
-¿Ofrecer a [NAME] que sea tu amigo?
-		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
-	</notification>
-	
 	<notification label="Añadir como amigo" name="AddFriendWithMessage">
 		Los amigos pueden darse permiso para localizarse en el mapa y para saber si el otro está conectado.

@@ -3752,7 +3745,11 @@ Por favor, reinténtalo en unos momentos.
 			<button name="Decline" text="Rehusar"/>
 		</form>
 	</notification>
-	
+
+	<notification name="FriendshipOffered">
+		Has ofrecido amistad a [TO_NAME]
+	</notification>
+
 	<notification name="OfferFriendshipNoMessage">
 		[NAME] te está ofreciendo amistad.

--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -287,6 +287,7 @@
 	<string name="connected">Conectado</string>
 	<string name="unavailable">Chat de Voz no disponible en esta ubicación</string>
 	<string name="hang_up">Desconectado del Chat de Voz</string>
+	<string name="conference-title">Chat multi-persona</string>
 	<string name="ScriptTakeMoney">Transferir moneda de tu cuenta</string>
 	<string name="ActOnControlInputs">Actuar en tus controles de entrada</string>
 	<string name="RemapControlInputs">Reconfigurar tus controles de entrada</string>
@@ -3223,6 +3224,10 @@ La
 	<string name="Region">Región</string>
 	<string name="RegionSettings">Configuración de Región</string>

+	<!-- Multi Preview Floater -->
+	<string name="MultiPreviewTitle">Vista previa</string>
+	<string name="MultiPropertiesTitle">Propiedades</string>
+
 	<!-- inventory offer -->
 	<string name="InvOfferAnObjectNamed">Un objeto llamado</string>
 	<string name="InvOfferOwnedByGroup">propiedad del grupo</string>
@@ -4209,6 +4214,8 @@ Intenta entrecomillando el camino al editor.
 	<string name="BeaconMedia">Viendo balizas de medios (blanco)</string>
 	<string name="ParticleHiding">Oocultando PartículasHiding Particlesstring>

+	<string name="Command_Profile_Label">Perfil</string>
+
 	<!-- Pathfinding -->
 	<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
 	<string name="Pathfinding_Object_Attr_None">Ninguno</string>
--- a/indra/newview/skins/default/xui/fr/floater_directory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_directory.xml
@@ -98,7 +98,6 @@
 			</combo_box>
 			<button label="Parcourir" label_selected="Parcourir" name="Browse"/>
 			<button label="Rechercher" label_selected="Rechercher" name="Search" width="85"/>
-			<button label="Passer une annonce" label_selected="Passer une annonce" name="Place an Ad..."/>
 			<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
 			<scroll_list name="results">
 				<column label="Nom" name="name"/>
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1130,13 +1130,6 @@ Impossible d'acheter du terrain pour le groupe :
 Vous n'avez pas le droit d'acheter de terrain pour votre groupe.
 	</notification>

-	<notification label="Devenir amis" name="AddFriend">
-Vous pouvez suivre les déplacements de vos amis sur la carte et voir lorsqu'ils se connectent.
-
-Proposer à [NAME] de devenir votre ami(e).
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-
 	<notification label="Devenir amis" name="AddFriendWithMessage">
 Vous pouvez suivre les déplacements de vos amis sur la carte et voir lorsqu'ils se connectent.

@@ -3385,6 +3378,10 @@ L'objet [OBJECTFROMNAME] appartenant à un utilisateur inconnu vous a donné un(
 		</form>
 	</notification>

+	<notification name="FriendshipOffered">
+		Vous avez proposé à [TO_NAME] de devenir votre ami(e)
+	</notification>
+
 	<notification name="OfferFriendshipNoMessage">
 [NAME] vous demande de devenir son ami.

--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -455,4 +455,16 @@
 	<string name="choose_the_directory">
 		Choisir le r&#xE9;pertoire
 	</string>
+	<string name="conference-title">
+		Chat à plusieurs
+	</string>
+	<string name="MultiPreviewTitle">
+		Prévisualiser
+	</string>
+	<string name="MultiPropertiesTitle">
+		Propriétés
+	</string>
+	<string name="Command_Profile_Label">
+		Profil
+	</string>
 </strings>
--- a/indra/newview/skins/default/xui/pt/floater_directory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_directory.xml
@@ -92,7 +92,6 @@
 			</combo_box>
 			<button label="Procura" label_selected="Procura" name="Browse"/>
 			<button label="Buscar" label_selected="Buscar" name="Search"/>
-			<button label="Colocar Anúncio..." label_selected="Colocar Anúncio..." name="Place an Ad..."/>
 			<button label="Apagar" label_selected="Apagar" name="Delete"/>
 			<scroll_list name="results">
 				<column label="Nome" name="name"/>
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -1146,13 +1146,6 @@ Você ainda pode olhar o bate-papo e as mensagens instantâneas existentes, clic
 Você não tem permissão para comprar o terreno para o seu grupo ativado.
 	</notification>

-	<notification label="Adicionar amigo" name="AddFriend">
-		Amigos podem dar permissões de rastrear um ao outro pelo mapa e receber atualizações de status online.
-
-Oferecer amizade para [NAME]?
-		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Oferecer"/>
-	</notification>
-
 	<notification label="Adicionar amigo" name="AddFriendWithMessage">
 		Amigos podem dar permissões de rastrear um ao outro pelo mapa e receber atualizações de status online.

@@ -3174,6 +3167,10 @@ Por favor, tente novamente em alguns instantes.
 		</form>
 	</notification>

+	<notification name="FriendshipOffered">
+		Você convidou [TO_NAME] para ser seu amigo(a)
+	</notification>
+
 	<notification name="OfferFriendshipNoMessage">
 		[NAME] está lhe oferecendo sua amizade.

--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -205,4 +205,18 @@
 	<string name="load_files">Carregar Arquivos</string>
 	<string name="choose_the_directory">Escolher Diretório</string>

+	<string name="conference-title">
+		Bate-papo com várias pessoas
+	</string>
+
+	<string name="MultiPreviewTitle">
+		Preview
+	</string>
+	<string name="MultiPropertiesTitle">
+		Propriedades
+	</string>
+
+	<string name="Command_Profile_Label">
+		Perfil
+	</string>
 </strings>