From 034cb895bd5646d730e6f956af4ce849a010b184 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 6 Nov 2014 11:36:21 +0200
Subject: [PATCH] MAINT-3067 FIXED Show context menu when right clicking avatar
name in the list. Bumps, Pushes and Hits moved to Help from Develop menu
---
indra/newview/llfloaterbump.cpp | 1 +
.../skins/default/xui/da/menu_viewer.xml | 4 ++--
.../skins/default/xui/de/menu_viewer.xml | 4 ++--
.../skins/default/xui/en/menu_viewer.xml | 19 +++++++++----------
.../skins/default/xui/es/menu_viewer.xml | 4 ++--
.../skins/default/xui/fr/menu_viewer.xml | 4 ++--
.../skins/default/xui/it/menu_viewer.xml | 4 ++--
.../skins/default/xui/ja/menu_viewer.xml | 4 ++--
.../skins/default/xui/pl/menu_viewer.xml | 4 ++--
.../skins/default/xui/pt/menu_viewer.xml | 4 ++--
.../skins/default/xui/ru/menu_viewer.xml | 4 ++--
.../skins/default/xui/tr/menu_viewer.xml | 4 ++--
.../skins/default/xui/zh/menu_viewer.xml | 4 ++--
13 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index ad44c509d99..345df2fcb32 100755
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -58,6 +58,7 @@ void LLFloaterBump::onOpen(const LLSD& key)
if (!list)
return;
list->deleteAllItems();
+ list->setContextMenu(LLScrollListCtrl::MENU_AVATAR);
if (gMeanCollisionList.empty())
{
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index f2ed7c2e64c..aa6bc536727 100755
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -128,6 +128,7 @@
<menu_item_check label="Aktiver tips" name="Enable Hints"/>
<menu_item_call label="Rapporter misbrug" name="Report Abuse"/>
<menu_item_call label="Rapportér fejl" name="Report Bug"/>
+ <menu_item_call label="Stød, skub & slag" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="Om [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Avanceret" name="Advanced">
@@ -261,8 +262,7 @@
<menu label="Netværk" name="Network">
<menu_item_check label="Pause avatar" name="AgentPause"/>
<menu_item_call label="Mist en netværkspakke" name="Drop a Packet"/>
- </menu>
- <menu_item_call label="Stød, skub & slag" name="Bumps, Pushes &amp; Hits"/>
+ </menu>
<menu label="Verden" name="DevelopWorld">
<menu_item_check label="Vælg anden sol end region" name="Sim Sun Override"/>
<menu_item_check label="Fast vejr" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index c9fad9c9d39..50a6dafa91a 100755
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -176,6 +176,7 @@
<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
<menu_item_call label="Fehler melden" name="Report Bug"/>
+ <menu_item_call label="Rempler, Stöße & Schläge" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Erweitert" name="Advanced">
@@ -352,8 +353,7 @@
<menu_item_check label="Positionen der interpolierten Objekte anfragen" name="Ping Interpolate Object Positions"/>
<menu_item_call label="Ein Paket fallenlassen" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Geskriptete Kamera ausgeben" name="Dump Scripted Camera"/>
- <menu_item_call label="Rempler, Stöße & Schläge" name="Bumps, Pushes &amp; Hits"/>
+ <menu_item_call label="Geskriptete Kamera ausgeben" name="Dump Scripted Camera"/>
<menu label="Rekorder" name="Recorder">
<menu_item_call label="Wiedergabe starten" name="Start Playback"/>
<menu_item_call label="Wiedergabe stoppen" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 560f81a6fd0..658c716ee78 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1417,7 +1417,14 @@
</menu_item_call>
<menu_item_separator/>
-
+ <menu_item_call
+ label="Bumps, Pushes & Hits"
+ name="Bumps, Pushes &amp; Hits">
+ <menu_item_call.on_click
+ function="Floater.Show"
+ parameter="bumps" />
+ </menu_item_call>
+ <menu_item_separator/>
<menu_item_call
label="About [APP_NAME]"
name="About Second Life">
@@ -3031,15 +3038,7 @@
name="Dump Scripted Camera">
<menu_item_call.on_click
function="Advanced.DumpScriptedCamera" />
- </menu_item_call>
- <menu_item_call
- label="Bumps, Pushes & Hits"
- name="Bumps, Pushes &amp; Hits">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="bumps" />
- </menu_item_call>
-
+ </menu_item_call>
<menu
create_jump_keys="true"
label="Recorder"
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index d2117f08b6c..9596a8277ef 100755
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -175,6 +175,7 @@
<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Denunciar una infracción" name="Report Abuse"/>
<menu_item_call label="Informar de un fallo" name="Report Bug"/>
+ <menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Avanzado" name="Advanced">
@@ -322,8 +323,7 @@
<menu label="Red" name="Network">
<menu_item_check label="Pause Avatar" name="AgentPause"/>
<menu_item_call label="Drop a Packet" name="Drop a Packet"/>
- </menu>
- <menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/>
+ </menu>
<menu label="Mundo virtual" name="DevelopWorld">
<menu_item_check label="Anular el sol del Sim" name="Sim Sun Override"/>
<menu_item_check label="Meteorología fija" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 6e36d19ba91..2c30fe07b45 100755
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -176,6 +176,7 @@
<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
<menu_item_call label="Signaler un bug" name="Report Bug"/>
+ <menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Avancé" name="Advanced">
@@ -352,8 +353,7 @@
<menu_item_check label="Interpolation ping des positions des objets" name="Ping Interpolate Object Positions"/>
<menu_item_call label="Abandonner un paquet" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Dump caméra scriptée" name="Dump Scripted Camera"/>
- <menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp; Hits"/>
+ <menu_item_call label="Dump caméra scriptée" name="Dump Scripted Camera"/>
<menu label="Enregistreur" name="Recorder">
<menu_item_call label="Commencer la lecture" name="Start Playback"/>
<menu_item_call label="Arrêter la lecture" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index f535a53e66e..d25e11e7a4e 100755
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -176,6 +176,7 @@
<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
<menu_item_call label="Segnala abuso" name="Report Abuse"/>
<menu_item_call label="Segnala bug" name="Report Bug"/>
+ <menu_item_call label="Urti, spinte e contatti" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Avanzate" name="Advanced">
@@ -323,8 +324,7 @@
<menu label="Rete" name="Network">
<menu_item_check label="Metti in pausa" name="AgentPause"/>
<menu_item_call label="Lascia un pacchetto" name="Drop a Packet"/>
- </menu>
- <menu_item_call label="Urti, spinte e contatti" name="Bumps, Pushes &amp; Hits"/>
+ </menu>
<menu label="Mondo" name="DevelopWorld">
<menu_item_check label="Esclusione al sole della simulazione" name="Sim Sun Override"/>
<menu_item_check label="Clima fisso" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 4e6c6808c61..0b85c693f0c 100755
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -176,6 +176,7 @@
<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
<menu_item_call label="バグを報告する" name="Report Bug"/>
+ <menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
</menu>
<menu label="アドバンス" name="Advanced">
@@ -352,8 +353,7 @@
<menu_item_check label="挿入されたオブジェクトの位置の Ping" name="Ping Interpolate Object Positions"/>
<menu_item_call label="パケットドロップ" name="Drop a Packet"/>
</menu>
- <menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
- <menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp; Hits"/>
+ <menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
<menu label="レコーダー" name="Recorder">
<menu_item_call label="再生開始" name="Start Playback"/>
<menu_item_call label="再生停止" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index e1725fc3086..a354cca9ad9 100755
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -126,6 +126,7 @@
<menu_item_check label="Włącz podpowiedzi" name="Enable Hints"/>
<menu_item_call label="Złóż Raport o Nadużyciu" name="Report Abuse"/>
<menu_item_call label="Zgłoś błędy klienta" name="Report Bug"/>
+ <menu_item_call label="Zderzenia, popchnięcia & uderzenia" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="O [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Zaawansowane" name="Advanced">
@@ -252,8 +253,7 @@
<menu label="Sieć" name="Network">
<menu_item_check label="Zatrzymaj awatara" name="AgentPause"/>
<menu_item_call label="Upuść pakiet pamięci" name="Drop a Packet"/>
- </menu>
- <menu_item_call label="Zderzenia, popchnięcia & uderzenia" name="Bumps, Pushes &amp; Hits"/>
+ </menu>
<menu label="Świat" name="DevelopWorld">
<menu_item_check label="Domyślne ustawienia środowiska Regionu" name="Sim Sun Override"/>
<menu_item_check label="Ustalona pogoda" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index a761cfa1776..0bbb9683a09 100755
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -176,6 +176,7 @@
<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
<menu_item_call label="Relatar bug" name="Report Bug"/>
+ <menu_item_call label="Empurrões, trombadas e tapas" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Avançado" name="Advanced">
@@ -323,8 +324,7 @@
<menu label="Rede" name="Network">
<menu_item_check label="Pausar avatar" name="AgentPause"/>
<menu_item_call label="Drop a Packet" name="Drop a Packet"/>
- </menu>
- <menu_item_call label="Empurrões, trombadas e tapas" name="Bumps, Pushes &amp; Hits"/>
+ </menu>
<menu label="Mundo" name="DevelopWorld">
<menu_item_check label="Impor sobre sol de simulação" name="Sim Sun Override"/>
<menu_item_check label="Clima fixo" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index fad1ea51e09..f00a4df81ff 100755
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -167,6 +167,7 @@
<menu_item_call label="Инструкции..." name="How To"/>
<menu_item_call label="Жалоба" name="Report Abuse"/>
<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
+ <menu_item_call label="Столкновения, толчки и удары" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Дополнительно" name="Advanced">
@@ -343,8 +344,7 @@
<menu_item_check label="Прикрепить объекты для интерполяции" name="Ping Interpolate Object Positions"/>
<menu_item_call label="Опустить пакет" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Дамп камеры со скриптами" name="Dump Scripted Camera"/>
- <menu_item_call label="Столкновения, толчки и удары" name="Bumps, Pushes &amp; Hits"/>
+ <menu_item_call label="Дамп камеры со скриптами" name="Dump Scripted Camera"/>
<menu label="Диктофон" name="Recorder">
<menu_item_call label="Начать воспроизведение" name="Start Playback"/>
<menu_item_call label="Остановить воспроизведение" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 23e2903e03c..a488a0916fd 100755
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -174,6 +174,7 @@
<menu_item_call label="[SECOND_LIFE] Blogları" name="Second Life Blogs"/>
<menu_item_call label="Kötüye Kullanımı Bildir" name="Report Abuse"/>
<menu_item_call label="Hata Bildir" name="Report Bug"/>
+ <menu_item_call label="Toslamalar, İtmeler ve Vurmalar" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
</menu>
<menu label="Gelişmiş" name="Advanced">
@@ -350,8 +351,7 @@
<menu_item_check label="Nesne Konumlarını Ping İle İnterpole Edin" name="Ping Interpolate Object Positions"/>
<menu_item_call label="Paket Bırakın" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Komut Dosyalı Kameranın Dökümünü Al" name="Dump Scripted Camera"/>
- <menu_item_call label="Toslamalar, İtmeler ve Vurmalar" name="Bumps, Pushes &amp; Hits"/>
+ <menu_item_call label="Komut Dosyalı Kameranın Dökümünü Al" name="Dump Scripted Camera"/>
<menu label="Kaydedici" name="Recorder">
<menu_item_call label="Oynatmayı Başlat" name="Start Playback"/>
<menu_item_call label="Oynatmayı Durdur" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 46d46e901ca..adc29a39443 100755
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -174,6 +174,7 @@
<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
<menu_item_call label="違規舉報" name="Report Abuse"/>
<menu_item_call label="回報臭蟲" name="Report Bug"/>
+ <menu_item_call label="碰撞、推擠與打擊" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="進階" name="Advanced">
@@ -350,8 +351,7 @@
<menu_item_check label="探詢內插物件位置" name="Ping Interpolate Object Positions"/>
<menu_item_call label="丟出一個封包" name="Drop a Packet"/>
</menu>
- <menu_item_call label="傾印腳本控制的攝影機" name="Dump Scripted Camera"/>
- <menu_item_call label="碰撞、推擠與打擊" name="Bumps, Pushes &amp; Hits"/>
+ <menu_item_call label="傾印腳本控制的攝影機" name="Dump Scripted Camera"/>
<menu label="錄製器" name="Recorder">
<menu_item_call label="開始播放" name="Start Playback"/>
<menu_item_call label="停止播放" name="Stop Playback"/>
--
GitLab