From 3813ccb15a05c59ae86592c447645f2efdb71b45 Mon Sep 17 00:00:00 2001 From: TighMacFanatic Date: Sun, 29 May 2011 20:18:44 -0400 Subject: [PATCH] Removed commented out code. --- indra/newview/ascentprefschat.cpp | 36 ++-- indra/newview/ascentprefschat.h | 30 +-- indra/newview/ascentprefssys.cpp | 1 - indra/newview/ascentprefsvan.cpp | 310 +++++++++++++----------------- indra/newview/ascentprefsvan.h | 53 +++-- 5 files changed, 194 insertions(+), 236 deletions(-) diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp index 46dfa2756..bd52eb5f0 100644 --- a/indra/newview/ascentprefschat.cpp +++ b/indra/newview/ascentprefschat.cpp @@ -57,22 +57,22 @@ LLPrefsAscentChat::LLPrefsAscentChat() childSetCommitCallback("date_format_combobox", onCommitTimeDate, this); childSetCommitCallback("AscentInstantMessageResponseAnyone", onCommitAutoResponse, this); - childSetCommitCallback("AscentInstantMessageResponseFriends", onCommitAutoResponse, this); - childSetCommitCallback("AscentInstantMessageResponseMuted", onCommitAutoResponse, this); + childSetCommitCallback("AscentInstantMessageResponseFriends", onCommitAutoResponse, this); + childSetCommitCallback("AscentInstantMessageResponseMuted", onCommitAutoResponse, this); childSetCommitCallback("AscentInstantMessageShowOnTyping", onCommitAutoResponse, this); - childSetCommitCallback("AscentInstantMessageShowResponded", onCommitAutoResponse, this); - childSetCommitCallback("AscentInstantMessageResponseRepeat", onCommitAutoResponse, this); - childSetCommitCallback("AscentInstantMessageResponseItem", onCommitAutoResponse, this); - childSetCommitCallback("im_response", onCommitAutoResponse, this); + childSetCommitCallback("AscentInstantMessageShowResponded", onCommitAutoResponse, this); + childSetCommitCallback("AscentInstantMessageResponseRepeat", onCommitAutoResponse, this); + childSetCommitCallback("AscentInstantMessageResponseItem", onCommitAutoResponse, this); + childSetCommitCallback("im_response", onCommitAutoResponse, this); childSetCommitCallback("KeywordsOn", onCommitKeywords, this); - childSetCommitCallback("KeywordsList", onCommitKeywords, this); - childSetCommitCallback("KeywordsSound", onCommitKeywords, this); + childSetCommitCallback("KeywordsList", onCommitKeywords, this); + childSetCommitCallback("KeywordsSound", onCommitKeywords, this); childSetCommitCallback("KeywordsInChat", onCommitKeywords, this); - childSetCommitCallback("KeywordsInIM", onCommitKeywords, this); - childSetCommitCallback("KeywordsChangeColor", onCommitKeywords, this); - childSetCommitCallback("KeywordsColor", onCommitKeywords, this); - childSetCommitCallback("KeywordsPlaySound", onCommitKeywords, this); + childSetCommitCallback("KeywordsInIM", onCommitKeywords, this); + childSetCommitCallback("KeywordsChangeColor", onCommitKeywords, this); + childSetCommitCallback("KeywordsColor", onCommitKeywords, this); + childSetCommitCallback("KeywordsPlaySound", onCommitKeywords, this); refreshValues(); refresh(); @@ -235,9 +235,9 @@ void LLPrefsAscentChat::refreshValues() //Chat/IM ----------------------------------------------------------------------------- mWoLfVerticalIMTabs = gSavedSettings.getBOOL("WoLfVerticalIMTabs"); mIMAnnounceIncoming = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"); - mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification"); + mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification"); mShowGroupNameInChatIM = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"); - mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound"); + mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound"); mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat"); mEnableMUPose = gSavedSettings.getBOOL("AscentAllowMUpose"); mEnableOOCAutoClose = gSavedSettings.getBOOL("AscentAutoCloseOOC"); @@ -305,10 +305,6 @@ void LLPrefsAscentChat::refreshValues() void LLPrefsAscentChat::refresh() { //Chat -------------------------------------------------------------------------------- -/* - LLRadioGroup* radioLinkOptions = getChild("objects_link"); - radioLinkOptions->selectNthItem(mLinksForChattingObjects); -*/ // time format combobox LLComboBox* combo = getChild("time_format_combobox"); if (combo) @@ -413,9 +409,9 @@ void LLPrefsAscentChat::cancel() //Chat/IM ----------------------------------------------------------------------------- gSavedSettings.setBOOL("WoLfVerticalIMTabs", mWoLfVerticalIMTabs); gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming); - gSavedSettings.setBOOL("AscentHideTypingNotification", mHideTypingNotification); + gSavedSettings.setBOOL("AscentHideTypingNotification", mHideTypingNotification); gSavedSettings.setBOOL("OptionShowGroupNameInChatIM", mShowGroupNameInChatIM); - gSavedSettings.setBOOL("PlayTypingSound", mPlayTypingSound); + gSavedSettings.setBOOL("PlayTypingSound", mPlayTypingSound); gSavedSettings.setBOOL("HideNotificationsInChat", mHideNotificationsInChat); gSavedSettings.setBOOL("AscentAllowMUpose", mEnableMUPose); gSavedSettings.setBOOL("AscentAutoCloseOOC", mEnableOOCAutoClose); diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h index 3bc641bb2..85b8d45d6 100644 --- a/indra/newview/ascentprefschat.h +++ b/indra/newview/ascentprefschat.h @@ -39,13 +39,13 @@ class LLPrefsAscentChat : public LLPanel { public: - LLPrefsAscentChat(); - ~LLPrefsAscentChat(); + LLPrefsAscentChat(); + ~LLPrefsAscentChat(); - void apply(); - void cancel(); + void apply(); + void cancel(); void refresh(); - void refreshValues(); + void refreshValues(); protected: static void onSpellAdd(void* data); @@ -54,21 +54,21 @@ protected: static void onSpellEditCustom(void* data); static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata); static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata); - static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data); - static void onCommitKeywords(LLUICtrl* ctrl, void* user_data); + static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data); + static void onCommitKeywords(LLUICtrl* ctrl, void* user_data); //Chat/IM ----------------------------------------------------------------------------- BOOL mWoLfVerticalIMTabs; BOOL mIMAnnounceIncoming; - BOOL mHideTypingNotification; + BOOL mHideTypingNotification; BOOL mShowGroupNameInChatIM; - BOOL mPlayTypingSound; + BOOL mPlayTypingSound; BOOL mHideNotificationsInChat; BOOL mEnableMUPose; BOOL mEnableOOCAutoClose; U32 mLinksForChattingObjects; U32 mTimeFormat; - U32 mDateFormat; + U32 mDateFormat; U32 tempTimeFormat; U32 tempDateFormat; BOOL mSecondsInChatAndIMs; @@ -94,13 +94,13 @@ protected: //Text Options ------------------------------------------------------------------------ BOOL mSpellDisplay; BOOL mKeywordsOn; - std::string mKeywordsList; - BOOL mKeywordsInChat; + std::string mKeywordsList; + BOOL mKeywordsInChat; BOOL mKeywordsInIM; - BOOL mKeywordsChangeColor; - LLColor4 mKeywordsColor; + BOOL mKeywordsChangeColor; + LLColor4 mKeywordsColor; BOOL mKeywordsPlaySound; - LLUUID mKeywordsSound; + LLUUID mKeywordsSound; }; #endif diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp index f42c1a504..66a8d7e72 100644 --- a/indra/newview/ascentprefssys.cpp +++ b/indra/newview/ascentprefssys.cpp @@ -303,7 +303,6 @@ void LLPrefsAscentSys::cancel() gSavedSettings.setBOOL("AscentBuildAlwaysEnabled", mBuildAlwaysEnabled); gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", mAlwaysShowFly); gSavedSettings.setBOOL("AscentDisableMinZoomDist", mDisableMinZoom); -// gSavedSettings.setBOOL("AscentPowerfulWizard", mPowerUser); gSavedSettings.setBOOL("AscentUseSystemFolder", mUseSystemFolder); gSavedSettings.setBOOL("AscentSystemTemporary", mUploadToSystem); gSavedSettings.setBOOL("FetchInventoryOnLogin", mFetchInventoryOnLogin); diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp index a4ebab6c0..4ff96a614 100644 --- a/indra/newview/ascentprefsvan.cpp +++ b/indra/newview/ascentprefsvan.cpp @@ -52,27 +52,27 @@ LLPrefsAscentVan::LLPrefsAscentVan() { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml"); + LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml"); - childSetCommitCallback("tag_spoofing_combobox", onCommitClientTag, this); + childSetCommitCallback("tag_spoofing_combobox", onCommitClientTag, this); - childSetCommitCallback("show_my_tag_check", onCommitCheckBox, this); - childSetCommitCallback("show_self_tag_check", onCommitCheckBox, this); - childSetCommitCallback("show_self_tag_color_check", onCommitCheckBox, this); - childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this); - childSetCommitCallback("show_friend_tag_check", onCommitCheckBox, this); - childSetCommitCallback("use_status_check", onCommitCheckBox, this); + childSetCommitCallback("show_my_tag_check", onCommitCheckBox, this); + childSetCommitCallback("show_self_tag_check", onCommitCheckBox, this); + childSetCommitCallback("show_self_tag_color_check", onCommitCheckBox, this); + childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this); + childSetCommitCallback("show_friend_tag_check", onCommitCheckBox, this); + childSetCommitCallback("use_status_check", onCommitCheckBox, this); - childSetCommitCallback("custom_tag_label_box", onCommitTextModified, this); + childSetCommitCallback("custom_tag_label_box", onCommitTextModified, this); - childSetCommitCallback("X Modifier", onCommitUpdateAvatarOffsets); - childSetCommitCallback("Y Modifier", onCommitUpdateAvatarOffsets); - childSetCommitCallback("Z Modifier", onCommitUpdateAvatarOffsets); + childSetCommitCallback("X Modifier", onCommitUpdateAvatarOffsets); + childSetCommitCallback("Y Modifier", onCommitUpdateAvatarOffsets); + childSetCommitCallback("Z Modifier", onCommitUpdateAvatarOffsets); - childSetAction("update_clientdefs", onManualClientUpdate, this); + childSetAction("update_clientdefs", onManualClientUpdate, this); refreshValues(); - refresh(); + refresh(); } LLPrefsAscentVan::~LLPrefsAscentVan() @@ -82,32 +82,32 @@ LLPrefsAscentVan::~LLPrefsAscentVan() //static void LLPrefsAscentVan::onCommitClientTag(LLUICtrl* ctrl, void* userdata) { - std::string client_uuid; - U32 client_index; + std::string client_uuid; + U32 client_index; - LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata; - LLComboBox* combo = (LLComboBox*)ctrl; + LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata; + LLComboBox* combo = (LLComboBox*)ctrl; if (combo) - { - client_index = combo->getCurrentIndex(); - //Don't rebake if it's not neccesary. - if (client_index != self->mSelectedClient) - { - client_uuid = combo->getSelectedValue().asString(); - gSavedSettings.setString("AscentReportClientUUID", client_uuid); - gSavedSettings.setU32("AscentReportClientIndex", client_index); + { + client_index = combo->getCurrentIndex(); + //Don't rebake if it's not neccesary. + if (client_index != self->mSelectedClient) + { + client_uuid = combo->getSelectedValue().asString(); + gSavedSettings.setString("AscentReportClientUUID", client_uuid); + gSavedSettings.setU32("AscentReportClientIndex", client_index); - LLVOAvatar* avatar = gAgent.getAvatarObject(); + LLVOAvatar* avatar = gAgent.getAvatarObject(); if (avatar) { - // Slam pending upload count to "unstick" things - bool slam_for_debug = true; - avatar->forceBakeAllTextures(slam_for_debug); + // Slam pending upload count to "unstick" things + bool slam_for_debug = true; + avatar->forceBakeAllTextures(slam_for_debug); } - } - } + } + } } //static @@ -115,157 +115,131 @@ void LLPrefsAscentVan::onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdat { if (!gAgent.getID().isNull()) { - gAgent.sendAgentSetAppearance(); + gAgent.sendAgentSetAppearance(); } } //static void LLPrefsAscentVan::onCommitTextModified(LLUICtrl* ctrl, void* userdata) { - LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata; + LLPrefsAscentVan* self = (LLPrefsAscentVan*)userdata; if (ctrl->getName() == "custom_tag_label_box") { gSavedSettings.setString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box")); } } -/* -//static -void LLPrefsAscentVan::onCommitColor(LLUICtrl* ctrl, void* user_data) -{ - LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data; - llinfos << "Control named " << ctrl->getControlName() << " aka " << ctrl->getName() << llendl; - - if (ctrl->getName() == "custom_tag_color_swatch") - { - llinfos << "Recreating color message for tag update." << llendl; - gSavedSettings.setString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box")); -// gSavedSettings.setColor4("AscentCustomTagColor", self->childGetValue("custom_tag_color_swatch")); - - if (!gAgent.getID().isNull()) - { - gAgent.sendAgentSetAppearance(); - gAgent.resetClientTag(); - } - } -} -*/ //static void LLPrefsAscentVan::onManualClientUpdate(void* data) { - LLChat chat; - chat.mSourceType = CHAT_SOURCE_SYSTEM; - chat.mText = llformat("Definitions already up-to-date."); - if (LLVOAvatar::updateClientTags()) - { - chat.mText = llformat("Client definitions updated."); - LLVOAvatar::loadClientTags(); - for (std::vector::iterator iter = LLCharacter::sInstances.begin(); - iter != LLCharacter::sInstances.end(); ++iter) - { - LLVOAvatar* avatarp = (LLVOAvatar*) *iter; - if(avatarp) - { - LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition(); - avatarp->mClientTag = ""; - } - } - } - LLFloaterChat::addChat(chat); + LLChat chat; + chat.mSourceType = CHAT_SOURCE_SYSTEM; + chat.mText = llformat("Definitions already up-to-date."); + if (LLVOAvatar::updateClientTags()) + { + chat.mText = llformat("Client definitions updated."); + LLVOAvatar::loadClientTags(); + for (std::vector::iterator iter = LLCharacter::sInstances.begin(); + iter != LLCharacter::sInstances.end(); ++iter) + { + LLVOAvatar* avatarp = (LLVOAvatar*) *iter; + if(avatarp) + { + LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition(); + avatarp->mClientTag = ""; + } + } + } + LLFloaterChat::addChat(chat); } //static void LLPrefsAscentVan::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) { - LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data; + LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data; // llinfos << "Control named " << ctrl->getControlName() << llendl; -/* - if (ctrl->getControlName() == "AscentStoreSettingsPerAccount") - { - self->refresh(); - } -*/ - if (ctrl->getName() == "show_friend_tag_check") - { - for (std::vector::iterator iter = LLCharacter::sInstances.begin(); - iter != LLCharacter::sInstances.end(); ++iter) - { - LLVOAvatar* avatarp = (LLVOAvatar*) *iter; - if(avatarp) - { - LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition(); - avatarp->mClientTag = ""; - } - } - } + + if (ctrl->getName() == "show_friend_tag_check") + { + for (std::vector::iterator iter = LLCharacter::sInstances.begin(); + iter != LLCharacter::sInstances.end(); ++iter) + { + LLVOAvatar* avatarp = (LLVOAvatar*) *iter; + if(avatarp) + { + LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition(); + avatarp->mClientTag = ""; + } + } + } else if (ctrl->getName() == "use_status_check") { - for (std::vector::iterator iter = LLCharacter::sInstances.begin(); - iter != LLCharacter::sInstances.end(); ++iter) - { - LLVOAvatar* avatarp = (LLVOAvatar*) *iter; - if(avatarp) - { - LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition(); - avatarp->mClientTag = ""; - } - } + for (std::vector::iterator iter = LLCharacter::sInstances.begin(); + iter != LLCharacter::sInstances.end(); ++iter) + { + LLVOAvatar* avatarp = (LLVOAvatar*) *iter; + if(avatarp) + { + LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition(); + avatarp->mClientTag = ""; + } + } BOOL showCustomColors = gSavedSettings.getBOOL("AscentUseStatusColors"); - self->childSetEnabled("friends_color_textbox", showCustomColors); - self->childSetEnabled("friend_color_swatch", showCustomColors); - self->childSetEnabled("estate_owner_color_swatch", showCustomColors); - self->childSetEnabled("linden_color_swatch", showCustomColors); - self->childSetEnabled("muted_color_swatch", showCustomColors); + self->childSetEnabled("friends_color_textbox", showCustomColors); + self->childSetEnabled("friend_color_swatch", showCustomColors); + self->childSetEnabled("estate_owner_color_swatch", showCustomColors); + self->childSetEnabled("linden_color_swatch", showCustomColors); + self->childSetEnabled("muted_color_swatch", showCustomColors); } else if (ctrl->getName() == "customize_own_tag_check") { - BOOL showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag"); - self->childSetEnabled("custom_tag_label_text", showCustomOptions); - self->childSetEnabled("custom_tag_label_box", showCustomOptions); - self->childSetEnabled("custom_tag_color_text", showCustomOptions); - self->childSetEnabled("custom_tag_color_swatch", showCustomOptions); + BOOL showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag"); + self->childSetEnabled("custom_tag_label_text", showCustomOptions); + self->childSetEnabled("custom_tag_label_box", showCustomOptions); + self->childSetEnabled("custom_tag_color_text", showCustomOptions); + self->childSetEnabled("custom_tag_color_swatch", showCustomOptions); } if (!gAgent.getID().isNull()) { - gAgent.sendAgentSetAppearance(); - gAgent.resetClientTag(); + gAgent.sendAgentSetAppearance(); + gAgent.resetClientTag(); } } // Store current settings for cancel void LLPrefsAscentVan::refreshValues() { - //General -------------------------------------------------------------------------------- - mUseAccountSettings = gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"); - mShowTPScreen = !gSavedSettings.getBOOL("AscentDisableTeleportScreens"); - mPlayTPSound = gSavedSettings.getBOOL("OptionPlayTpSound"); - mShowLogScreens = !gSavedSettings.getBOOL("AscentDisableLogoutScreens"); + //General -------------------------------------------------------------------------------- + mUseAccountSettings = gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"); + mShowTPScreen = !gSavedSettings.getBOOL("AscentDisableTeleportScreens"); + mPlayTPSound = gSavedSettings.getBOOL("OptionPlayTpSound"); + mShowLogScreens = !gSavedSettings.getBOOL("AscentDisableLogoutScreens"); - //Tags\Colors ---------------------------------------------------------------------------- + //Tags\Colors ---------------------------------------------------------------------------- mAscentUseTag = gSavedSettings.getBOOL("AscentUseTag"); mReportClientUUID = gSavedSettings.getString("AscentReportClientUUID"); - mSelectedClient = gSavedSettings.getU32("AscentReportClientIndex"); + mSelectedClient = gSavedSettings.getU32("AscentReportClientIndex"); mShowSelfClientTag = gSavedSettings.getBOOL("AscentShowSelfTag"); - mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor"); + mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor"); mShowFriendsTag = gSavedSettings.getBOOL("AscentShowFriendsTag"); - mCustomTagOn = gSavedSettings.getBOOL("AscentUseCustomTag"); - mCustomTagLabel = gSavedSettings.getString("AscentCustomTagLabel"); - mCustomTagColor = gSavedSettings.getColor4("AscentCustomTagColor"); + mCustomTagOn = gSavedSettings.getBOOL("AscentUseCustomTag"); + mCustomTagLabel = gSavedSettings.getString("AscentCustomTagLabel"); + mCustomTagColor = gSavedSettings.getColor4("AscentCustomTagColor"); mShowOthersTag = gSavedSettings.getBOOL("AscentShowOthersTag"); mShowOthersTagColor = gSavedSettings.getBOOL("AscentShowOthersTagColor"); mShowIdleTime = gSavedSettings.getBOOL("AscentShowIdleTime"); mUseStatusColors = gSavedSettings.getBOOL("AscentUseStatusColors"); mUpdateTagsOnLoad = gSavedSettings.getBOOL("AscentUpdateTagsOnLoad"); - mEffectColor = gSavedSettings.getColor4("EffectColor"); - mFriendColor = gSavedSettings.getColor4("AscentFriendColor"); - mEstateOwnerColor = gSavedSettings.getColor4("AscentEstateOwnerColor"); - mLindenColor = gSavedSettings.getColor4("AscentLindenColor"); - mMutedColor = gSavedSettings.getColor4("AscentMutedColor"); - //mCustomColor = gSavedSettings.getColor4("MoyMiniMapCustomColor"); + mEffectColor = gSavedSettings.getColor4("EffectColor"); + mFriendColor = gSavedSettings.getColor4("AscentFriendColor"); + mEstateOwnerColor = gSavedSettings.getColor4("AscentEstateOwnerColor"); + mLindenColor = gSavedSettings.getColor4("AscentLindenColor"); + mMutedColor = gSavedSettings.getColor4("AscentMutedColor"); + //mCustomColor = gSavedSettings.getColor4("MoyMiniMapCustomColor"); //Body Dynamics -------------------------------------------------------------------------- mBreastPhysicsToggle = gSavedSettings.getBOOL("EmeraldBreastPhysicsToggle"); @@ -283,31 +257,23 @@ void LLPrefsAscentVan::refreshValues() // Update controls based on current settings void LLPrefsAscentVan::refresh() { - //General -------------------------------------------------------------------------------- + //General -------------------------------------------------------------------------------- - //Tags\Colors ---------------------------------------------------------------------------- - LLComboBox* combo = getChild("tag_spoofing_combobox"); - combo->setCurrentByIndex(mSelectedClient); -/* - getChild("effect_color_swatch")->set(mEffectColor); - getChild("custom_tag_color_swatch")->set(mCustomTagColor); - getChild("friend_color_swatch")->set(mFriendColor); - getChild("linden_color_swatch")->set(mLindenColor); - getChild("muted_color_swatch")->set(mMutedColor); - getChild("estate_owner_color_swatch")->set(mEstateOwnerColor); - //getChild("custom_color_swatch")->set(mCustomColor); -*/ - childSetEnabled("friends_color_textbox", mUseStatusColors); - childSetEnabled("friend_color_swatch", mUseStatusColors); - childSetEnabled("estate_owner_color_swatch", mUseStatusColors); - childSetEnabled("linden_color_swatch", mUseStatusColors); - childSetEnabled("muted_color_swatch", mUseStatusColors); + //Tags\Colors ---------------------------------------------------------------------------- + LLComboBox* combo = getChild("tag_spoofing_combobox"); + combo->setCurrentByIndex(mSelectedClient); + + childSetEnabled("friends_color_textbox", mUseStatusColors); + childSetEnabled("friend_color_swatch", mUseStatusColors); + childSetEnabled("estate_owner_color_swatch", mUseStatusColors); + childSetEnabled("linden_color_swatch", mUseStatusColors); + childSetEnabled("muted_color_swatch", mUseStatusColors); childSetEnabled("custom_tag_label_text", mCustomTagOn); - childSetEnabled("custom_tag_label_box", mCustomTagOn); - childSetValue("custom_tag_label_box", gSavedSettings.getString("AscentCustomTagLabel")); - childSetEnabled("custom_tag_color_text", mCustomTagOn); - childSetEnabled("custom_tag_color_swatch", mCustomTagOn); + childSetEnabled("custom_tag_label_box", mCustomTagOn); + childSetValue("custom_tag_label_box", gSavedSettings.getString("AscentCustomTagLabel")); + childSetEnabled("custom_tag_color_text", mCustomTagOn); + childSetEnabled("custom_tag_color_swatch", mCustomTagOn); //Body Dynamics -------------------------------------------------------------------------- childSetEnabled("EmeraldBoobMass", mBreastPhysicsToggle); @@ -320,32 +286,32 @@ void LLPrefsAscentVan::refresh() // Reset settings to local copy void LLPrefsAscentVan::cancel() { - //General -------------------------------------------------------------------------------- - gSavedSettings.setBOOL("AscentStoreSettingsPerAccount", mUseAccountSettings); - gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen); - gSavedSettings.setBOOL("OptionPlayTpSound", mPlayTPSound); - gSavedSettings.setBOOL("AscentDisableLogoutScreens", !mShowLogScreens); + //General -------------------------------------------------------------------------------- + gSavedSettings.setBOOL("AscentStoreSettingsPerAccount", mUseAccountSettings); + gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen); + gSavedSettings.setBOOL("OptionPlayTpSound", mPlayTPSound); + gSavedSettings.setBOOL("AscentDisableLogoutScreens", !mShowLogScreens); - //Tags\Colors ---------------------------------------------------------------------------- + //Tags\Colors ---------------------------------------------------------------------------- gSavedSettings.setBOOL("AscentUseTag", mAscentUseTag); gSavedSettings.setString("AscentReportClientUUID", mReportClientUUID); - gSavedSettings.setU32("AscentReportClientIndex", mSelectedClient); + gSavedSettings.setU32("AscentReportClientIndex", mSelectedClient); gSavedSettings.setBOOL("AscentShowSelfTag", mShowSelfClientTag); - gSavedSettings.setBOOL("AscentShowSelfTagColor", mShowSelfClientTagColor); + gSavedSettings.setBOOL("AscentShowSelfTagColor", mShowSelfClientTagColor); gSavedSettings.setBOOL("AscentShowFriendsTag", mShowFriendsTag); - gSavedSettings.setBOOL("AscentUseCustomTag", mCustomTagOn); - gSavedSettings.setString("AscentCustomTagLabel", mCustomTagLabel); - gSavedSettings.setColor4("AscentCustomTagColor", mCustomTagColor); + gSavedSettings.setBOOL("AscentUseCustomTag", mCustomTagOn); + gSavedSettings.setString("AscentCustomTagLabel", mCustomTagLabel); + gSavedSettings.setColor4("AscentCustomTagColor", mCustomTagColor); gSavedSettings.setBOOL("AscentShowOthersTag", mShowOthersTag); gSavedSettings.setBOOL("AscentShowOthersTagColor", mShowOthersTagColor); gSavedSettings.setBOOL("AscentShowIdleTime", mShowIdleTime); gSavedSettings.setBOOL("AscentUseStatusColors", mUseStatusColors); gSavedSettings.setBOOL("AscentUpdateTagsOnLoad", mUpdateTagsOnLoad); - gSavedSettings.setColor4("EffectColor", mEffectColor); - gSavedSettings.setColor4("AscentFriendColor", mFriendColor); - gSavedSettings.setColor4("AscentEstateOwnerColor", mEstateOwnerColor); - gSavedSettings.setColor4("AscentLindenColor", mLindenColor); - gSavedSettings.setColor4("AscentMutedColor", mMutedColor); + gSavedSettings.setColor4("EffectColor", mEffectColor); + gSavedSettings.setColor4("AscentFriendColor", mFriendColor); + gSavedSettings.setColor4("AscentEstateOwnerColor", mEstateOwnerColor); + gSavedSettings.setColor4("AscentLindenColor", mLindenColor); + gSavedSettings.setColor4("AscentMutedColor", mMutedColor); // gSavedSettings.setColor4("MoyMiniMapCustomColor", mCustomColor); //Body Dynamics -------------------------------------------------------------------------- @@ -364,6 +330,6 @@ void LLPrefsAscentVan::cancel() // Update local copy so cancel has no effect void LLPrefsAscentVan::apply() { - refreshValues(); + refreshValues(); refresh(); } diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h index 1ebb31fea..5545c5b2f 100644 --- a/indra/newview/ascentprefsvan.h +++ b/indra/newview/ascentprefsvan.h @@ -38,48 +38,45 @@ class LLPrefsAscentVan : public LLPanel { public: - LLPrefsAscentVan(); - ~LLPrefsAscentVan(); + LLPrefsAscentVan(); + ~LLPrefsAscentVan(); - void apply(); - void cancel(); - void refresh(); - void refreshValues(); - -// LLPanel* getPanel(); + void apply(); + void cancel(); + void refresh(); + void refreshValues(); protected: - static void onCommitClientTag(LLUICtrl* ctrl, void* userdata); - static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata); - static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); + static void onCommitClientTag(LLUICtrl* ctrl, void* userdata); + static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata); + static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); static void onCommitTextModified(LLUICtrl* ctrl, void* userdata); -// static void onCommitColor(LLUICtrl* ctrl, void* user_data); - static void onManualClientUpdate(void* data); - //General - BOOL mUseAccountSettings; - BOOL mShowTPScreen; - BOOL mPlayTPSound; - BOOL mShowLogScreens; - //Tags\Colors + static void onManualClientUpdate(void* data); + //General + BOOL mUseAccountSettings; + BOOL mShowTPScreen; + BOOL mPlayTPSound; + BOOL mShowLogScreens; + //Tags\Colors BOOL mAscentUseTag; std::string mReportClientUUID; - U32 mSelectedClient; - BOOL mShowSelfClientTag; - BOOL mShowSelfClientTagColor; + U32 mSelectedClient; + BOOL mShowSelfClientTag; + BOOL mShowSelfClientTagColor; BOOL mShowFriendsTag; - BOOL mCustomTagOn; + BOOL mCustomTagOn; std::string mCustomTagLabel; - LLColor4 mCustomTagColor; + LLColor4 mCustomTagColor; BOOL mShowOthersTag; BOOL mShowOthersTagColor; BOOL mShowIdleTime; BOOL mUseStatusColors; BOOL mUpdateTagsOnLoad; LLColor4 mEffectColor; - LLColor4 mFriendColor; - LLColor4 mEstateOwnerColor; - LLColor4 mLindenColor; - LLColor4 mMutedColor; + LLColor4 mFriendColor; + LLColor4 mEstateOwnerColor; + LLColor4 mLindenColor; + LLColor4 mMutedColor; //Body Dynamics BOOL mBreastPhysicsToggle; F32 mBoobMass;