From b203315c04220b16ab39cd4015aa888bfecb528b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 13 Jan 2010 09:34:39 -0700
Subject: Created drop-down Profile button in IM window
---
linden/indra/newview/llimpanel.cpp | 97 +++++++++++++++-----
linden/indra/newview/llimpanel.h | 5 +-
.../default/xui/da/floater_instant_message.xml | 2 +-
.../default/xui/de/floater_instant_message.xml | 2 +-
.../default/xui/en-us/floater_instant_message.xml | 21 +++--
.../xui/en-us/floater_instant_message_group.xml | 4 +-
.../default/xui/es/floater_instant_message.xml | 100 ++++++++++-----------
.../default/xui/fr/floater_instant_message.xml | 100 ++++++++++-----------
.../default/xui/hu/floater_instant_message.xml | 2 +-
.../default/xui/it/floater_instant_message.xml | 2 +-
.../default/xui/ja/floater_instant_message.xml | 2 +-
.../default/xui/ko/floater_instant_message.xml | 2 +-
.../default/xui/pl/floater_instant_message.xml | 2 +-
.../default/xui/pt/floater_instant_message.xml | 100 ++++++++++-----------
.../default/xui/ru/floater_instant_message.xml | 2 +-
.../default/xui/tr/floater_instant_message.xml | 2 +-
.../default/xui/uk/floater_instant_message.xml | 2 +-
.../default/xui/zh/floater_instant_message.xml | 2 +-
18 files changed, 254 insertions(+), 195 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a5950ce..5088343 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -47,6 +47,7 @@
#include "llbutton.h"
#include "llcallingcard.h"
#include "llchat.h"
+#include "llcombobox.h"
#include "llconsole.h"
#include "llfloater.h"
#include "llfloatergroupinfo.h"
@@ -60,6 +61,7 @@
#include "llfloaterchat.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
+#include "llmenucommands.h"
#include "llnotify.h"
#include "llresmgr.h"
#include "lltabcontainer.h"
@@ -1080,6 +1082,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
LLFloater(session_label, LLRect(), session_label),
mInputEditor(NULL),
mHistoryEditor(NULL),
+ mComboIM(NULL),
mSessionUUID(session_id),
mVoiceChannel(NULL),
mSessionInitialized(FALSE),
@@ -1296,7 +1299,17 @@ BOOL LLFloaterIMPanel::postBuild()
mInputEditor->setRevertOnEsc( FALSE );
mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
- childSetAction("profile_callee_btn", onClickProfile, this);
+ // Profile combobox in floater_instant_message.xml
+ mComboIM = getChild<LLComboBox>("profile_callee_btn");
+ mComboIM->setCommitCallback(onCommitCombo);
+ mComboIM->setCallbackUserData(this);
+
+#ifdef LL_WINDOWS
+ mComboIM->add(getString("history_entry"));
+#endif
+ mComboIM->add(getString("pay_entry"));
+ mComboIM->add(getString("teleport_entry"));
+
childSetAction("group_info_btn", onClickGroupInfo, this);
childSetAction("history_btn", onClickHistory, this);
@@ -1304,7 +1317,6 @@ BOOL LLFloaterIMPanel::postBuild()
childSetAction("end_call_btn", onClickEndCall, this);
childSetAction("send_btn", onClickSend, this);
childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
- childSetAction("offer_tp_btn", onClickOfferTeleport, this);
childSetAction("moderator_kick_speaker", onKickSpeaker, this);
//LLButton* close_btn = getChild<LLButton>("close_btn");
@@ -1792,26 +1804,6 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
}
// static
-void LLFloaterIMPanel::onClickOfferTeleport(void* userdata)
-{
- LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-
- handle_lure(self->mOtherParticipantUUID);
-}
-
-// static
-void LLFloaterIMPanel::onClickProfile( void* userdata )
-{
- // Bring up the Profile window
- LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-
- if (self->mOtherParticipantUUID.notNull())
- {
- LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
- }
-}
-
-// static
void LLFloaterIMPanel::onClickHistory( void* userdata )
{
LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
@@ -1904,6 +1896,67 @@ void LLFloaterIMPanel::onCommitChat(LLUICtrl* caller, void* userdata)
}
// static
+void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
+{
+ LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+ LLCtrlListInterface* options = self->mComboIM ? self->mComboIM->getListInterface() : NULL;
+ if (options)
+ {
+ S32 index = options->getFirstSelectedIndex();
+ if (index < 0)
+ {
+ // Open profile or group window
+ if (self->mOtherParticipantUUID.notNull())
+ {
+ LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
+ }
+ return;
+ }
+
+ std::string selected = self->mComboIM->getSelectedValue().asString();
+ if (selected == self->getString("history_entry"))
+ {
+ if (self->mOtherParticipantUUID.notNull())
+ {
+ struct stat fileInfo;
+ int result;
+
+ std::string fullname = self->getTitle();;
+ //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
+ //if(fullname == "(Loading...)")
+ std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
+
+ // check if file exists by trying to get its attributes
+ result = stat(file_path.c_str(), &fileInfo);
+ if(result == 0)
+ {
+ char command[256];
+ sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
+ gViewerWindow->getWindow()->ShellEx(command);
+
+ llinfos << command << llendl;
+ }
+ else
+ {
+ LLSD args;
+ args["[NAME]"] = fullname;
+ LLNotifications::instance().add("IMLogNotFound", args);
+ llinfos << file_path << llendl;
+ }
+ }
+ }
+ else if (selected == self->getString("pay_entry"))
+ {
+ handle_pay_by_id(self->mOtherParticipantUUID);
+ }
+ else if (selected == self->getString("teleport_entry"))
+ {
+ handle_lure(self->mOtherParticipantUUID);
+ }
+ }
+}
+
+// static
void LLFloaterIMPanel::onInputEditorFocusReceived( LLFocusableElement* caller, void* userdata )
{
LLFloaterIMPanel* self= (LLFloaterIMPanel*) userdata;
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index f3477bb..24f5c9b 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -47,6 +47,7 @@ class LLInventoryItem;
class LLInventoryCategory;
class LLIMSpeakerMgr;
class LLPanelActiveSpeakers;
+class LLComboBox;
class LLVoiceChannel : public LLVoiceClientStatusObserver
{
@@ -228,12 +229,11 @@ public:
static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata);
static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
static void onCommitChat(LLUICtrl* caller, void* userdata);
+ static void onCommitCombo(LLUICtrl* caller, void* userdata);
static void onTabClick( void* userdata );
- static void onClickProfile( void* userdata );
static void onClickHistory( void* userdata );
static void onClickGroupInfo( void* userdata );
- static void onClickOfferTeleport( void* userdata );
static void onClickClose( void* userdata );
static void onClickStartCall( void* userdata );
static void onClickEndCall( void* userdata );
@@ -300,6 +300,7 @@ private:
private:
LLLineEditor* mInputEditor;
LLViewerTextEditor* mHistoryEditor;
+ LLComboBox* mComboIM;
// The value of the mSessionUUID depends on how the IM session was started:
// one-on-one ==> random id
diff --git a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
index 13a7adf..9b695b5 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
Tekst chat er ikke tilgængeligt i dette opkald.
</string>
- <button label="Profil..." name="profile_callee_btn"/>
+ <flyout_button label="Profil..." name="profile_callee_btn"/>
<button label="Opkald" name="start_call_btn" pad_right="7" width="120"/>
<button halign="right" label="Afbryd" name="end_call_btn" width="120"/>
<panel left_delta="116" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 667be04..1e926c4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
Für diese Verbindung ist kein Text-Chat verfügbar.
</string>
- <button label="Profil..." name="profile_callee_btn"/>
+ <flyout_button label="Profil..." name="profile_callee_btn"/>
<button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
<button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
<panel left_delta="111" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index be8508f..c8ec0fd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -37,20 +37,25 @@
<string name="unavailable_text_label">
Text chat is not available for this call.
</string>
- <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
- name="profile_callee_btn" width="80" />
- <button bottom_delta="0" follows="left|top" font="SansSerif"
- halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
- mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
+ <string name="history_entry">
+ History
+ </string>
+ <string name="pay_entry">
+ Pay
+ </string>
+ <string name="teleport_entry">
+ Offer Teleport
+ </string>
+ <flyout_button bottom="-40" follows="left|top" height="20" label="Profile" left="5" width="90"
+ list_position="below" mouse_opaque="true" name="profile_callee_btn">
+ </flyout_button>
<button bottom="-40" follows="left|top" halign="center" height="20"
image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
- label="Call" left_delta="107" name="start_call_btn" width="100" />
+ label="Call" left_delta="95" name="start_call_btn" width="100" />
<button bottom="-40" follows="left|top" halign="center" height="20"
image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
visible="false" width="100" />
- <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
- name="history_btn" visible="true" width="85" />
<text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right"
text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 2e97d64..fd63221 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -45,10 +45,10 @@
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
height="130" left="0" min_width="210" name="im_contents_panel" width="175">
<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
- name="group_info_btn" tab_group="0" width="80" />
+ name="group_info_btn" tab_group="0" width="90" />
<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
- label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
+ label="Join Call" left_delta="95" name="start_call_btn" pad_right="12"
width="92" />
<button bottom_delta="0" follows="left|top" halign="right" height="20"
image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
diff --git a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 0ba63fc..30b23d1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(desconocido)" name="im_floater" title="(desconocido)">
- <string name="ringing">
- Llamando...
- </string>
- <string name="answering">
- Conectando...
- </string>
- <string name="connected">
- Conectado, pulse Colgar para acabar
- </string>
- <string name="hang_up">
- Llamada finalizada
- </string>
- <string name="inventory_item_offered">
- Ofrecido un ítem del inventario
- </string>
- <string name="voice_icon">
- icn_voice-pvtfocus.tga
- </string>
- <string name="title_string">
- Mensaje instantáneo a [NAME]
- </string>
- <string name="typing_start_string">
- [NAME] está escribiendo...
- </string>
- <string name="session_start_string">
- Iniciando una sesión con [NAME]; por favor, espere.
- </string>
- <string name="default_text_label">
- Pulse aquí para enviar un mensaje instantáneo.
- </string>
- <string name="unavailable_text_label">
- Para esta llamada no está disponible el chat de texto.
- </string>
- <button label="Perfil..." name="profile_callee_btn"/>
- <button label="Llamar" name="start_call_btn"/>
- <button label="Colgar" name="end_call_btn"/>
- <panel name="speaker_controls">
- <button label="" name="mute_btn" tool_tip="Silenciar la voz"/>
- </panel>
- <line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/>
- <button label="Enviar" name="send_btn"/>
- <string name="live_help_dialog">
- *** Bienvenido a la Petición de Ayuda ***
-Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/
-Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible.
--=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+ <string name="ringing">
+ Llamando...
+ </string>
+ <string name="answering">
+ Conectando...
+ </string>
+ <string name="connected">
+ Conectado, pulse Colgar para acabar
+ </string>
+ <string name="hang_up">
+ Llamada finalizada
+ </string>
+ <string name="inventory_item_offered">
+ Ofrecido un ítem del inventario
+ </string>
+ <string name="voice_icon">
+ icn_voice-pvtfocus.tga
+ </string>
+ <string name="title_string">
+ Mensaje instantáneo a [NAME]
+ </string>
+ <string name="typing_start_string">
+ [NAME] está escribiendo...
+ </string>
+ <string name="session_start_string">
+ Iniciando una sesión con [NAME]; por favor, espere.
+ </string>
+ <string name="default_text_label">
+ Pulse aquí para enviar un mensaje instantáneo.
+ </string>
+ <string name="unavailable_text_label">
+ Para esta llamada no está disponible el chat de texto.
+ </string>
+ <flyout_button label="Perfil..." name="profile_callee_btn"/>
+ <button label="Llamar" name="start_call_btn"/>
+ <button label="Colgar" name="end_call_btn"/>
+ <panel name="speaker_controls">
+ <button label="" name="mute_btn" tool_tip="Silenciar la voz"/>
+ </panel>
+ <line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/>
+ <button label="Enviar" name="send_btn"/>
+ <string name="live_help_dialog">
+ *** Bienvenido a la Petición de Ayuda ***
+Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/
+Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible.
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
+ </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index 15539bc..926483b 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(inconnue)" name="im_floater" title="(inconnue)">
- <string name="ringing">
- Appel en cours...
- </string>
- <string name="answering">
- Connexion en cours...
- </string>
- <string name="connected">
- Connecté(e), cliquez sur Raccrocher pour terminer l'appel
- </string>
- <string name="hang_up">
- Appel terminé
- </string>
- <string name="inventory_item_offered">
- Objet de l'inventaire offert
- </string>
- <string name="voice_icon">
- icn_voice-pvtfocus.tga
- </string>
- <string name="title_string">
- Envoyer un message instantané à [NAME]
- </string>
- <string name="typing_start_string">
- [NAME] est en train d'écrire…
- </string>
- <string name="session_start_string">
- Début de la session avec [NAME], veuillez patienter.
- </string>
- <string name="default_text_label">
- Cliquez ici pour envoyer un message instantané.
- </string>
- <string name="unavailable_text_label">
- Le chat écrit n'est pas disponible pour cet appel.
- </string>
- <button label="Profil..." name="profile_callee_btn"/>
- <button label="Appeler" name="start_call_btn"/>
- <button label="Raccrocher" name="end_call_btn"/>
- <panel name="speaker_controls">
- <button label="" name="mute_btn" tool_tip="Ignorez"/>
- </panel>
- <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
- <button label="Envoyer" name="send_btn"/>
- <string name="live_help_dialog">
- *** Bienvenue sur la page Demande d'aide ***
-Veuillez au préalable consulter les pages d'aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/
-Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu'un vous réponde.
--=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(inconnue)" name="im_floater" title="(inconnue)">
+ <string name="ringing">
+ Appel en cours...
+ </string>
+ <string name="answering">
+ Connexion en cours...
+ </string>
+ <string name="connected">
+ Connecté(e), cliquez sur Raccrocher pour terminer l'appel
+ </string>
+ <string name="hang_up">
+ Appel terminé
+ </string>
+ <string name="inventory_item_offered">
+ Objet de l'inventaire offert
+ </string>
+ <string name="voice_icon">
+ icn_voice-pvtfocus.tga
+ </string>
+ <string name="title_string">
+ Envoyer un message instantané à [NAME]
+ </string>
+ <string name="typing_start_string">
+ [NAME] est en train d'écrire…
+ </string>
+ <string name="session_start_string">
+ Début de la session avec [NAME], veuillez patienter.
+ </string>
+ <string name="default_text_label">
+ Cliquez ici pour envoyer un message instantané.
+ </string>
+ <string name="unavailable_text_label">
+ Le chat écrit n'est pas disponible pour cet appel.
+ </string>
+ <flyout_button label="Profil..." name="profile_callee_btn"/>
+ <button label="Appeler" name="start_call_btn"/>
+ <button label="Raccrocher" name="end_call_btn"/>
+ <panel name="speaker_controls">
+ <button label="" name="mute_btn" tool_tip="Ignorez"/>
+ </panel>
+ <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
+ <button label="Envoyer" name="send_btn"/>
+ <string name="live_help_dialog">
+ *** Bienvenue sur la page Demande d'aide ***
+Veuillez au préalable consulter les pages d'aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/
+Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu'un vous réponde.
+-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
+ </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
index e4f5892..3469323 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt.
</string>
- <button label="Adatlap" name="profile_callee_btn"/>
+ <flyout_button label="Adatlap" name="profile_callee_btn"/>
<button label="Hívás" name="start_call_btn"/>
<button label="Hívás vége" name="end_call_btn"/>
<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
index 58e043f..7bdc046 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
La chat di testo non è disponibile in questa chiamata.
</string>
- <button label="Profilo..." name="profile_callee_btn"/>
+ <flyout_button label="Profilo..." name="profile_callee_btn"/>
<button label="Chiama" name="start_call_btn"/>
<button label="Termina" name="end_call_btn"/>
<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index a8e91e1..c9de54e 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
このコールでは文字チャットが利用できません。
</string>
- <button label="プロフィール" name="profile_callee_btn" width="100"/>
+ <flyout_button label="プロフィール" name="profile_callee_btn" width="100"/>
<button label="コール" left_delta="105" name="start_call_btn" width="100"/>
<button label="呼出終了" name="end_call_btn" width="100"/>
<panel left_delta="96" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
index 1ad7d69..f1d0a48 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
@@ -21,7 +21,7 @@
<string name="default_text_label">
메신저를 사용하려면 여기를 클릭하십시오.
</string>
- <button label="프로필" name="profile_callee_btn" />
+ <flyout_button label="프로필" name="profile_callee_btn" />
<button label="음성연결" name="start_call_btn" />
<button label="연결종료" name="end_call_btn" />
<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
index 2851356..1d918b8 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
Czat nie jest dostępny dla tej rozmowy
</string>
- <button label="Profil..." name="profile_callee_btn"/>
+ <flyout_button label="Profil..." name="profile_callee_btn"/>
<button label="Dzwoń" name="start_call_btn"/>
<button label="Skończ" name="end_call_btn"/>
<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 0927cd3..983a13c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
- <string name="ringing">
- Chamando...
- </string>
- <string name="answering">
- Conectando...
- </string>
- <string name="connected">
- Conectado, clique Finalizar Chamada para deixar em espera
- </string>
- <string name="hang_up">
- Chamada encerrada
- </string>
- <string name="inventory_item_offered">
- Oferecido um item de Inventário
- </string>
- <string name="voice_icon">
- icn_voice-pvtfocus.tga
- </string>
- <string name="title_string">
- Mensagem Instantânea com [NAME]
- </string>
- <string name="typing_start_string">
- [NAME] está digitando...
- </string>
- <string name="session_start_string">
- Iniciando uma sessão com [NAME]. Por favor, aguarde.
- </string>
- <string name="default_text_label">
- Clique aqui para uma mensagem instantânea.
- </string>
- <string name="unavailable_text_label">
- Conversa por texto não está disponível para esta chamada.
- </string>
- <button label="Perfil..." name="profile_callee_btn"/>
- <button label="Chamar" name="start_call_btn"/>
- <button label="Terminar Chamada" name="end_call_btn"/>
- <panel name="speaker_controls">
- <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
- </panel>
- <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
- <button label="Enviar" name="send_btn"/>
- <string name="live_help_dialog">
- *** Bem Vindo a Solicitação de Ajuda ***
-Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em
-http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.
--=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
+ <string name="ringing">
+ Chamando...
+ </string>
+ <string name="answering">
+ Conectando...
+ </string>
+ <string name="connected">
+ Conectado, clique Finalizar Chamada para deixar em espera
+ </string>
+ <string name="hang_up">
+ Chamada encerrada
+ </string>
+ <string name="inventory_item_offered">
+ Oferecido um item de Inventário
+ </string>
+ <string name="voice_icon">
+ icn_voice-pvtfocus.tga
+ </string>
+ <string name="title_string">
+ Mensagem Instantânea com [NAME]
+ </string>
+ <string name="typing_start_string">
+ [NAME] está digitando...
+ </string>
+ <string name="session_start_string">
+ Iniciando uma sessão com [NAME]. Por favor, aguarde.
+ </string>
+ <string name="default_text_label">
+ Clique aqui para uma mensagem instantânea.
+ </string>
+ <string name="unavailable_text_label">
+ Conversa por texto não está disponível para esta chamada.
+ </string>
+ <flyout_button label="Perfil..." name="profile_callee_btn"/>
+ <button label="Chamar" name="start_call_btn"/>
+ <button label="Terminar Chamada" name="end_call_btn"/>
+ <panel name="speaker_controls">
+ <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+ </panel>
+ <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
+ <button label="Enviar" name="send_btn"/>
+ <string name="live_help_dialog">
+ *** Bem Vindo a Solicitação de Ajuda ***
+Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em
+http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.
+-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+ </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
index db9e975..7aa1c19 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
Текстовый чат недоступен для этого вызова.
</string>
- <button label="Профиль..." name="profile_callee_btn"/>
+ <flyout_button label="Профиль..." name="profile_callee_btn"/>
<button label="Звонок" name="start_call_btn"/>
<button label="Конец звонка" name="end_call_btn"/>
<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
index d804a70..b627271 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
Bu arama için yazılı sohbet mevcut değil.
</string>
- <button label="Profil..." name="profile_callee_btn"/>
+ <flyout_button label="Profil..." name="profile_callee_btn"/>
<button label="Ara" name="start_call_btn"/>
<button label="Kapat" name="end_call_btn"/>
<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
index bdd51fe..60ac3b8 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
@@ -33,7 +33,7 @@
<string name="unavailable_text_label">
Текстовий чат недоступний для цього виклику.
</string>
- <button label="Профіль..." name="profile_callee_btn"/>
+ <flyout_button label="Профіль..." name="profile_callee_btn"/>
<button label="Дзвінок" name="start_call_btn"/>
<button label="Кінець дзвінка" name="end_call_btn"/>
<panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index 70433c1..ace6d8c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -30,7 +30,7 @@
<string name="unavailable_text_label">
本次通话不可以文字聊天。
</string>
- <button label="档案..." name="profile_callee_btn"/>
+ <flyout_button label="档案..." name="profile_callee_btn"/>
<button label="呼叫" name="start_call_btn"/>
<button label="结束呼叫" name="end_call_btn" pad_right="10" visible="false"/>
<panel name="speaker_controls">
--
cgit v1.1