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

Fix old namesystem code that broke initially setting Legacy (w/display) for everything in general.

Browse Source 
Also cleans up old logic and directs the friends list to update when the user changes the namesystem for it specifically.
Thanks to um... I think it was Deltek, who discovered this bug.
This commit is contained in:
Lirusaito
2014-07-09 03:08:13 -04:00
parent 315883a28c
commit 1e9b79e2c1
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpanelgeneral.cpp
View File

@@ -142,19 +142,8 @@ void LLPanelGeneral::apply()
LLComboBox* fade_out_combobox = getChild<LLComboBox>("fade_out_combobox");
gSavedSettings.setS32("RenderName", fade_out_combobox->getCurrentIndex());
S32 namesystem_combobox_index = getChild<LLComboBox>("namesystem_combobox")->getCurrentIndex();
BOOL show_resident = getChild<LLUICtrl>("show_resident_checkbox")->getValue();
if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox_index || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident){
gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox_index);
gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident);
if(gAgent.getRegion()){
if(namesystem_combobox_index<=0 || namesystem_combobox_index>2) LLAvatarNameCache::setUseDisplayNames(false);
else LLAvatarNameCache::setUseDisplayNames(true);
LLVOAvatar::invalidateNameTags(); // Remove all clienttags to get them updated
LLAvatarTracker::instance().updateFriends();
}
}
gSavedSettings.setS32("PhoenixNameSystem", getChild<LLComboBox>("namesystem_combobox")->getCurrentIndex());
gSavedSettings.setBOOL("LiruShowLastNameResident", getChild<LLUICtrl>("show_resident_checkbox")->getValue());
gSavedSettings.setString("LoginLocation", childGetValue("default_start_location").asString());
gSavedSettings.setBOOL("ShowStartLocation", childGetValue("show_location_checkbox"));

4
indra/newview/llviewercontrol.cpp
View File

@@ -629,6 +629,8 @@ static bool handlePhoenixNameSystemChanged(const LLSD& newvalue)
}
// [/Ansariel: Display name support]
bool handleUpdateFriends() { LLAvatarTracker::instance().updateFriends(); return true; }
static bool handleAllowLargeSounds(const LLSD& newvalue)
{
if(gAudiop)
@@ -826,6 +828,8 @@ void settings_setup_listeners()
// [Ansariel: Display name support]
gSavedSettings.getControl("PhoenixNameSystem")->getSignal()->connect(boost::bind(&handlePhoenixNameSystemChanged, _2));
// [/Ansariel: Display name support]
gSavedSettings.getControl("LiruShowLastNameResident")->getSignal()->connect(boost::bind(handlePhoenixNameSystemChanged, _2));
gSavedSettings.getControl("FriendNameSystem")->getSignal()->connect(boost::bind(handleUpdateFriends));
gSavedSettings.getControl("AllowLargeSounds")->getSignal()->connect(boost::bind(&handleAllowLargeSounds, _2));
gSavedSettings.getControl("LiruUseZQSDKeys")->getSignal()->connect(boost::bind(load_default_bindings, _2));