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

Apply fix for windows compile warning from internal

Browse Source
This commit is contained in:
Inusaito Sayori
2013-07-29 12:42:48 -04:00
parent 2b2a6d5ea6
commit 258c0da8d3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llpanelgeneral.cpp
View File

@@ -142,13 +142,13 @@ void LLPanelGeneral::apply()
LLComboBox* fade_out_combobox = getChild<LLComboBox>("fade_out_combobox");
gSavedSettings.setS32("RenderName", fade_out_combobox->getCurrentIndex());
LLComboBox* namesystem_combobox = getChild<LLComboBox>("namesystem_combobox");
LLUICtrl* show_resident_checkbox = getChild<LLUICtrl>("show_resident_checkbox");
if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox->getCurrentIndex() || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident_checkbox->getValue().asBoolean()){
gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox->getCurrentIndex());
gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident_checkbox->getValue());
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->getCurrentIndex()<=0 || namesystem_combobox->getCurrentIndex()>2) LLAvatarNameCache::setUseDisplayNames(false);
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