Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Tried to access singleton 19LLFloaterAvatarList from singleton constructor!

Browse Source 
SV-1979 #resolve
This commit is contained in:
Inusaito Sayori
2015-09-04 15:43:13 -04:00
parent 21729724a7
commit bb4109f982
7 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloateravatarlist.cpp
View File

@@ -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<bool> radar_alert_chat_range(gSavedSettings, "RadarAlertChatRange");
static LLCachedControl<bool> 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
{

10
indra/newview/skins/default/xui/de/floater_radar.xml
View File

@@ -91,14 +91,4 @@
<string name="Creating particles">Erzeuge Partikel</string>
<string name="Just arrived">Soeben angekommen</string>
<string name="Typing">Tippen</string>
<string name="has_triggered_your_avatar_age_alert">hat Avatar-Alters-Alarm ausgelöst</string>
<string name="template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_entered">ist eingetroffen</string>
<string name="has_left">hat verlassen</string>
<!-- [RANGE] -->
<string name="the_sim">die Sim</string>
<string name="draw_distance">Anzeigeentfernung</string>
<string name="shout_range">Rufweite</string>
<string name="chat_range">Sprechweite</string>
</floater>

11
indra/newview/skins/default/xui/de/strings.xml
View File

@@ -1798,6 +1798,17 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="ScriptCountObject">Counted [SCRIPTS] scripts in [OBJECTS] objects.</string>
<string name="ScriptDeleteObject">Deleted [SCRIPTS] scripts in [OBJECTS] objects.</string>
<string name="took_a_snapshot">took a snapshot</string>
<!-- Radar Alert Strings -->
<string name="radar_alert_template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_triggered_your_avatar_age_alert">hat Avatar-Alters-Alarm ausgelöst</string>
<string name="has_entered">ist eingetroffen</string>
<string name="has_left">hat verlassen</string>
<!-- [RANGE] -->
<string name="the_sim">die Sim</string>
<string name="draw_distance">Anzeigeentfernung</string>
<string name="shout_range">Rufweite</string>
<string name="chat_range">Sprechweite</string>
<!-- Avatar busy/away mode -->
<string name="AvatarSetNotAway">Nicht abwesend</string>

10
indra/newview/skins/default/xui/en-us/floater_radar.xml
View File

@@ -350,14 +350,4 @@
<string name="Creating particles">Creating particles</string>
<string name="Just arrived">Just arrived</string>
<string name="Typing">Typing</string>
<string name="has_triggered_your_avatar_age_alert">has triggered your avatar age alert</string>
<string name="template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_entered">has entered</string>
<string name="has_left">has left</string>
<!-- [RANGE] -->
<string name="the_sim">the sim</string>
<string name="draw_distance">draw distance</string>
<string name="shout_range">shout range</string>
<string name="chat_range">chat range</string>
</floater>

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

@@ -3103,6 +3103,18 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="ScriptDeleteObject">Deleted [SCRIPTS] scripts in [OBJECTS] objects.</string>
<string name="took_a_snapshot">took a snapshot</string>
<!-- Radar Alert Strings -->
<string name="radar_alert_template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_triggered_your_avatar_age_alert">has triggered your avatar age alert</string>
<string name="has_entered">has entered</string>
<string name="has_left">has left</string>
<!-- [RANGE] -->
<string name="the_sim">the sim</string>
<string name="draw_distance">draw distance</string>
<string name="shout_range">shout range</string>
<string name="chat_range">chat range</string>
<!-- Avatar busy/away mode -->
<string name="AvatarSetNotAway">Not Away</string>
<string name="AvatarSetAway">Away</string>

10
indra/newview/skins/default/xui/es/floater_radar.xml
View File

@@ -85,14 +85,4 @@
<string name="Creating particles">Emitiendo partículas</string>
<string name="Just arrived">Recién Llegado</string>
<string name="Typing">Escribiendo</string>
<string name="has_triggered_your_avatar_age_alert">ha disparado el Alerta de Edad de Avatar</string>
<string name="template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_entered">ha entrado en</string>
<string name="has_left">se ha retirado de</string>
<!-- [RANGE] -->
<string name="the_sim">este sim</string>
<string name="draw_distance">la distancia de dibujo</string>
<string name="shout_range">la distancia de grito</string>
<string name="chat_range">la distancia de chat</string>
</floater>

11
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -3092,6 +3092,17 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="ScriptCountObject">Contados [SCRIPTS] scripts en [OBJECTS] objetos. ([RUNNING] ejecutándose, [MONO] mono.)</string>
<string name="ScriptDeleteObject">Borrados [SCRIPTS] scripts en [OBJECTS] objetos.</string>
<string name="took_a_snapshot">ha tomado una fotografía</string>
<!-- Radar Alert Strings -->
<string name="radar_alert_template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_triggered_your_avatar_age_alert">ha disparado el Alerta de Edad de Avatar</string>
<string name="has_entered">ha entrado en</string>
<string name="has_left">se ha retirado de</string>
<!-- [RANGE] -->
<string name="the_sim">este sim</string>
<string name="draw_distance">la distancia de dibujo</string>
<string name="shout_range">la distancia de grito</string>
<string name="chat_range">la distancia de chat</string>
<!-- Avatar busy/away mode -->
<string name="AvatarSetNotAway">No ausente</string>