From 2be05793b171492ddf8c5ec6f06f185486d49a47 Mon Sep 17 00:00:00 2001 From: Beeks Date: Thu, 26 Aug 2010 20:58:01 -0400 Subject: [PATCH] Minor adjustments mostly. The Custom Tag features are in semi-working mode, still need some tweaks to correct for per-account saving. Moved Revoke On Stand to "Privacy" - Should it be renamed "Security?" Maybe "Paranoia." Beacon menu was fixed - It's back to classic SL's no-floater method, thank god. Another fix for compiling in Linux - And another thanks to Verissimo Seetan for pointing it out. Signed-off-by: Beeks --- indra/newview/app_settings/settings.xml | 11 ++ .../app_settings/settings_per_account.xml | 38 +++++++ indra/newview/ascentprefsvan.cpp | 63 +++++++---- indra/newview/llpanelskins.cpp | 6 +- indra/newview/llvoavatar.cpp | 15 ++- .../skins/default/xui/en-us/menu_viewer.xml | 101 ++++++++++++++++-- .../en-us/panel_preferences_ascent_vanity.xml | 4 +- 7 files changed, 203 insertions(+), 35 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b3c9829f6..11a7afb9a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -213,6 +213,17 @@ Value mapto + AscentCmdLineMapToKeepPos + + Comment + Attempt to arrive in the same location you were at. + Persist + 1 + Type + Boolean + Value + 0 + AscentCmdLineDrawDistance Comment diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index ee9cf2dd6..03e2bcc03 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -14,6 +14,44 @@ + AscentUseCustomTag + + Comment + Show a custom local tag. + Persist + 1 + Type + Boolean + Value + 0 + + AscentCustomTagColor + + Comment + Color of custom local tag. + Persist + 1 + Type + Color4 + Value + + 0.5 + 1.0 + 0.25 + 1.0 + + + AscentCustomTagLabel + + Comment + Label for the custom local tag + Persist + 1 + Type + String + Value + Custom + AscentSpoofClientIndex Comment diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp index 3b20ce398..ae2b60d70 100644 --- a/indra/newview/ascentprefsvan.cpp +++ b/indra/newview/ascentprefsvan.cpp @@ -82,20 +82,7 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl() childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this); childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this); - if (gSavedSettings.getBOOL("AscentUseCustomTag")) - { - childEnable("custom_tag_label_text"); - childEnable("custom_tag_label_box"); - childEnable("custom_tag_color_text"); - childEnable("custom_tag_color_swatch"); - } - else - { - childDisable("custom_tag_label_text"); - childDisable("custom_tag_label_box"); - childDisable("custom_tag_color_text"); - childDisable("custom_tag_color_swatch"); - } + refresh(); } @@ -144,12 +131,46 @@ void LLPrefsAscentVanImpl::refreshValues() { mSelectedClient = gSavedSettings.getU32("AscentSpoofClientIndex"); mEffectColor = gSavedSettings.getColor4("EffectColor"); + if (gSavedSettings.getBOOL("AscentUseCustomTag")) + { + childEnable("custom_tag_label_text"); + childEnable("custom_tag_label_box"); + childEnable("custom_tag_color_text"); + childEnable("custom_tag_color_swatch"); + } + else + { + childDisable("custom_tag_label_text"); + childDisable("custom_tag_label_box"); + childDisable("custom_tag_color_text"); + childDisable("custom_tag_color_swatch"); + } + mCustomTagLabel = gSavedSettings.getString("AscentCustomTagLabel"); + mCustomTagColor = gSavedSettings.getColor4("AscentCustomTagColor"); } else { mSelectedClient = gSavedPerAccountSettings.getU32("AscentSpoofClientIndex"); mEffectColor = gSavedPerAccountSettings.getColor4("EffectColor"); + if (gSavedPerAccountSettings.getBOOL("AscentUseCustomTag")) + { + childEnable("custom_tag_label_text"); + childEnable("custom_tag_label_box"); + childEnable("custom_tag_color_text"); + childEnable("custom_tag_color_swatch"); + } + else + { + childDisable("custom_tag_label_text"); + childDisable("custom_tag_label_box"); + childDisable("custom_tag_color_text"); + childDisable("custom_tag_color_swatch"); + } + mCustomTagLabel = gSavedPerAccountSettings.getString("AscentCustomTagLabel"); + mCustomTagColor = gSavedPerAccountSettings.getColor4("AscentCustomTagColor"); } + + } void LLPrefsAscentVanImpl::refresh() @@ -179,10 +200,6 @@ void LLPrefsAscentVanImpl::refresh() gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white); gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor); } - - - - } void LLPrefsAscentVanImpl::cancel() @@ -230,12 +247,18 @@ void LLPrefsAscentVanImpl::apply() if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) { llinfos << "Storing color in client" << llendl; - gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); + gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); + gSavedSettings.setBOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check")); + gSavedSettings.setString("AscentCustomTagLabel", childGetValue("custom_tag_label_box")); + gSavedSettings.setColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch")); } else { llinfos << "Storing color in account" << llendl; - gSavedPerAccountSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); + gSavedPerAccountSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); + gSavedPerAccountSettings.setBOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check")); + gSavedPerAccountSettings.setString("AscentCustomTagLabel", childGetValue("custom_tag_label_box")); + gSavedPerAccountSettings.setColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch")); } diff --git a/indra/newview/llpanelskins.cpp b/indra/newview/llpanelskins.cpp index ad0ee6bec..324efa20d 100644 --- a/indra/newview/llpanelskins.cpp +++ b/indra/newview/llpanelskins.cpp @@ -91,7 +91,7 @@ void LLPanelSkins::refresh() while(found) { found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false); - llinfos << "path name " << path_name << " and name " << name << " and found " << found << llendl; + //llinfos << "path name " << path_name << " and name " << name << " and found " << found << llendl; if(found) { LLSD data; @@ -102,8 +102,8 @@ void LLPanelSkins::refresh() { datas.push_back(data); comboBox->add(data["skin_name"].asString()); - llinfos << "data is length " << datas.size() << " foldername field is " - << data["folder_name"].asString() << " and looking for " << gSavedSettings.getString("SkinCurrent") <getID().asString() == "4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6") { color = LLColor4(0.5f, 0.0f, 0.0f); - client = "Unknown"; + client = "??"; } return; } @@ -3448,7 +3454,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom } if (false) - //Probably should remove this entirely, but it's useful information if we're going to try for the new client tag idea. -HgB + //We'll remove this entirely eventually, but it's useful information if we're going to try for the new client tag idea. -HgB //if(useComment) { LLUUID baked_head_id = getTE(9)->getID(); @@ -5613,7 +5619,8 @@ void LLVOAvatar::processAnimationStateChanges() stop_glerror(); } -//Here's that undeform function I was talking about. -HGB +/*Here's that undeform function I was talking about. -HGB +// Bug-fixed Linden Labs style. Comment out 4ever. std::string undeformers[] = { "7a8a3dfc-acd1-7ac3-9cdf-71cd9be89969", @@ -5675,7 +5682,7 @@ void LLVOAvatar::undeform() } stop_glerror(); -} +}*/ diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 99d7e0b2a..6cb6d15aa 100644 --- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -69,7 +69,7 @@ - @@ -387,11 +387,100 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml index 07a2b24b9..da2abed87 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml @@ -90,8 +90,8 @@ tool_tip="Enabling this set your avatar name color to your client tag color or custom set color." mouse_opaque="true" name="show_self_tag_color_check" radio_style="false" width="400" /> -