From bb4109f982460df7a7586a3b2a76a5438d7f17fe Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 4 Sep 2015 15:43:13 -0400 Subject: [PATCH] Fix Tried to access singleton 19LLFloaterAvatarList from singleton constructor! SV-1979 #resolve --- indra/newview/llfloateravatarlist.cpp | 16 ++++++++-------- .../skins/default/xui/de/floater_radar.xml | 10 ---------- indra/newview/skins/default/xui/de/strings.xml | 11 +++++++++++ .../skins/default/xui/en-us/floater_radar.xml | 10 ---------- .../newview/skins/default/xui/en-us/strings.xml | 12 ++++++++++++ .../skins/default/xui/es/floater_radar.xml | 10 ---------- indra/newview/skins/default/xui/es/strings.xml | 11 +++++++++++ 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 462974185..a1d17ddad 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -27,6 +27,7 @@ #include "llscrolllistctrl.h" #include "llscrolllistitem.h" #include "llsdutil.h" +#include "lltrans.h" #include "lluictrlfactory.h" #include "llwindow.h" @@ -88,22 +89,21 @@ namespace static LLCachedControl radar_alert_chat_range(gSavedSettings, "RadarAlertChatRange"); static LLCachedControl radar_alert_age(gSavedSettings, "RadarAlertAge"); - LLFloaterAvatarList& inst(LLFloaterAvatarList::instance()); LLStringUtil::format_map_t args; LLChat chat; switch(type) { - case STAT_TYPE_SIM: if (radar_alert_sim) args["[RANGE]"] = inst.getString("the_sim"); break; - case STAT_TYPE_DRAW: if (radar_alert_draw) args["[RANGE]"] = inst.getString("draw_distance"); break; - case STAT_TYPE_SHOUTRANGE: if (radar_alert_shout_range) args["[RANGE]"] = inst.getString("shout_range"); break; - case STAT_TYPE_CHATRANGE: if (radar_alert_chat_range) args["[RANGE]"] = inst.getString("chat_range"); break; - case STAT_TYPE_AGE: if (radar_alert_age) chat.mText = name + " " + inst.getString("has_triggered_your_avatar_age_alert") + "."; break; + case STAT_TYPE_SIM: if (radar_alert_sim) args["[RANGE]"] = LLTrans::getString("the_sim"); break; + case STAT_TYPE_DRAW: if (radar_alert_draw) args["[RANGE]"] = LLTrans::getString("draw_distance"); break; + case STAT_TYPE_SHOUTRANGE: if (radar_alert_shout_range) args["[RANGE]"] = LLTrans::getString("shout_range"); break; + case STAT_TYPE_CHATRANGE: if (radar_alert_chat_range) args["[RANGE]"] = LLTrans::getString("chat_range"); break; + case STAT_TYPE_AGE: if (radar_alert_age) chat.mText = name + " " + LLTrans::getString("has_triggered_your_avatar_age_alert") + "."; break; default: llassert(type); break; } args["[NAME]"] = name; - args["[ACTION]"] = inst.getString(entering ? "has_entered" : "has_left"); + args["[ACTION]"] = LLTrans::getString(entering ? "has_entered" : "has_left"); if (args.find("[RANGE]") != args.end()) - chat.mText = inst.getString("template", args); + chat.mText = LLTrans::getString("radar_alert_template", args); else if (chat.mText.empty()) return; if (entering) // Note: If we decide to make this for leaving as well, change this check to dist != F32_MIN { diff --git a/indra/newview/skins/default/xui/de/floater_radar.xml b/indra/newview/skins/default/xui/de/floater_radar.xml index 25493ba0c..965a11274 100644 --- a/indra/newview/skins/default/xui/de/floater_radar.xml +++ b/indra/newview/skins/default/xui/de/floater_radar.xml @@ -91,14 +91,4 @@ Erzeuge Partikel Soeben angekommen Tippen - hat Avatar-Alters-Alarm ausgelöst - [NAME] [ACTION] [RANGE]. - - ist eingetroffen - hat verlassen - - die Sim - Anzeigeentfernung - Rufweite - Sprechweite diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 3906c31db..3e0877a8c 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -1798,6 +1798,17 @@ Where tag = tag string to match. Removes bot's matching the tag. Counted [SCRIPTS] scripts in [OBJECTS] objects. Deleted [SCRIPTS] scripts in [OBJECTS] objects. took a snapshot + + [NAME] [ACTION] [RANGE]. + + hat Avatar-Alters-Alarm ausgelöst + ist eingetroffen + hat verlassen + + die Sim + Anzeigeentfernung + Rufweite + Sprechweite Nicht abwesend diff --git a/indra/newview/skins/default/xui/en-us/floater_radar.xml b/indra/newview/skins/default/xui/en-us/floater_radar.xml index 79a4eb07f..2f538b521 100644 --- a/indra/newview/skins/default/xui/en-us/floater_radar.xml +++ b/indra/newview/skins/default/xui/en-us/floater_radar.xml @@ -350,14 +350,4 @@ Creating particles Just arrived Typing - has triggered your avatar age alert - [NAME] [ACTION] [RANGE]. - - has entered - has left - - the sim - draw distance - shout range - chat range diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml index 1317ce053..b514b5f23 100644 --- a/indra/newview/skins/default/xui/en-us/strings.xml +++ b/indra/newview/skins/default/xui/en-us/strings.xml @@ -3103,6 +3103,18 @@ Where tag = tag string to match. Removes bot's matching the tag. Deleted [SCRIPTS] scripts in [OBJECTS] objects. took a snapshot + + [NAME] [ACTION] [RANGE]. + + has triggered your avatar age alert + has entered + has left + + the sim + draw distance + shout range + chat range + Not Away Away diff --git a/indra/newview/skins/default/xui/es/floater_radar.xml b/indra/newview/skins/default/xui/es/floater_radar.xml index 7e6b7a70a..711001a82 100644 --- a/indra/newview/skins/default/xui/es/floater_radar.xml +++ b/indra/newview/skins/default/xui/es/floater_radar.xml @@ -85,14 +85,4 @@ Emitiendo partículas Recién Llegado Escribiendo - ha disparado el Alerta de Edad de Avatar - [NAME] [ACTION] [RANGE]. - - ha entrado en - se ha retirado de - - este sim - la distancia de dibujo - la distancia de grito - la distancia de chat diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index ad8d42096..03b29be1e 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -3092,6 +3092,17 @@ Where tag = tag string to match. Removes bot's matching the tag. Contados [SCRIPTS] scripts en [OBJECTS] objetos. ([RUNNING] ejecutándose, [MONO] mono.) Borrados [SCRIPTS] scripts en [OBJECTS] objetos. ha tomado una fotografía + + [NAME] [ACTION] [RANGE]. + + ha disparado el Alerta de Edad de Avatar + ha entrado en + se ha retirado de + + este sim + la distancia de dibujo + la distancia de grito + la distancia de chat No ausente