diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml index 86811ae6d..14fa6475f 100644 --- a/indra/newview/app_settings/settings_ascent.xml +++ b/indra/newview/app_settings/settings_ascent.xml @@ -130,7 +130,7 @@ Comment Keep those jerks guessing by hiding your "____ is typing..." message. Persist - 0 + 1 Type Boolean Value @@ -620,150 +620,5 @@ Value tp2 - AscentInstantMessageAnnounceIncoming - - Comment - Start IM window as soon as the person starts typing - Persist - 1 - Type - Boolean - Value - 1 - - AscentShowLookAt - - Comment - Show Others' Lookat points - Persist - 1 - Type - Boolean - Value - 0 - - AscentUseStatusColors - - Comment - Show special colors for statuses like Friend, Linden, so on - Persist - 1 - Type - Boolean - Value - 0 - - AscentAvatarXModifier - - Comment - Avatar position modifier (X) - Persist - 1 - Type - F32 - Value - 0.0 - - AscentAvatarYModifier - - Comment - Avatar position modifier (Y) - Persist - 1 - Type - F32 - Value - 0.0 - - AscentAvatarZModifier - - Comment - Avatar position modifier (Z) - Persist - 1 - Type - F32 - Value - 0.0 - - AscentUseSystemFolder - - Comment - Enables the System folder for setting and non-permanent asset storage. - Persist - 1 - Type - Boolean - Value - 0 - - AscentSystemTemporary - - Comment - When enabled, temporary uploads are put in the System Asset folder (if System Folder exists). - Persist - 1 - Type - Boolean - Value - 0 - - AscentShowFriendsTag - - Comment - Show friends client tags as (Friend), and colorize them specially. - Persist - 1 - Type - Boolean - Value - 1 - - AscentUseTag - - Comment - Broadcast client tag - Persist - 1 - Type - Boolean - Value - 1 - - AscentShowIdleTime - - Comment - Show client tags for others. - Persist - 1 - Type - Boolean - Value - 1 - - AscentShowOthersTag - - Comment - Show client tags for others. - Persist - 1 - Type - Boolean - Value - 1 - - AscentShowOthersTagColor - - Comment - Show avatar names in the color of their client. - Persist - 1 - Type - Boolean - Value - 1 - - - diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp index cdc07611a..05e53ce02 100644 --- a/indra/newview/ascentprefschat.cpp +++ b/indra/newview/ascentprefschat.cpp @@ -53,7 +53,23 @@ LLPrefsAscentChat::LLPrefsAscentChat() childSetAction("EmSpell_Add", onSpellAdd, this); childSetAction("EmSpell_Remove", onSpellRemove, this); - childSetCommitCallback("Keywords_Alert", onCommitCheckBox, this); + childSetCommitCallback("AscentInstantMessageResponseAnyone", 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("KeywordsOn", 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); refreshValues(); refresh(); @@ -64,23 +80,6 @@ LLPrefsAscentChat::~LLPrefsAscentChat() } //static -void LLPrefsAscentChat::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) -{ - LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data; - - if (ctrl->getName() == "Keywords_Alert") - { - bool enabled = self->childGetValue("Keywords_Alert").asBoolean(); - self->childSetEnabled("Keywords_Entries", enabled); - self->childSetEnabled("Keywords_LocalChat", enabled); - self->childSetEnabled("Keywords_IM", enabled); - self->childSetEnabled("Keywords_Highlight", enabled); - self->childSetEnabled("Keywords_Color", enabled); - self->childSetEnabled("Keywords_PlaySound", enabled); - self->childSetEnabled("Keywords_SoundUUID", enabled); - } -} - void LLPrefsAscentChat::onSpellAdd(void* data) { LLPrefsAscentChat* self = (LLPrefsAscentChat*)data; @@ -93,6 +92,7 @@ void LLPrefsAscentChat::onSpellAdd(void* data) self->refresh(); } +//static void LLPrefsAscentChat::onSpellRemove(void* data) { LLPrefsAscentChat* self = (LLPrefsAscentChat*)data; @@ -105,16 +105,19 @@ void LLPrefsAscentChat::onSpellRemove(void* data) self->refresh(); } +//static void LLPrefsAscentChat::onSpellGetMore(void* data) { glggHunSpell->getMoreButton(data); } +//static void LLPrefsAscentChat::onSpellEditCustom(void* data) { glggHunSpell->editCustomButton(); } +//static void LLPrefsAscentChat::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata) { LLComboBox* box = (LLComboBox*)ctrl; @@ -125,6 +128,49 @@ void LLPrefsAscentChat::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata } } +//static +void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data) +{ + LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data; + + gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone", self->childGetValue("AscentInstantMessageResponseAnyone")); + gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", self->childGetValue("AscentInstantMessageResponseFriends")); + gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", self->childGetValue("AscentInstantMessageResponseMuted")); + gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping", self->childGetValue("AscentInstantMessageShowOnTyping")); + gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded", self->childGetValue("AscentInstantMessageShowResponded")); + gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", self->childGetValue("AscentInstantMessageResponseRepeat")); + gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", self->childGetValue("AscentInstantMessageResponseItem")); + gSavedPerAccountSettings.setString("AscentInstantMessageResponse", self->childGetValue("im_response")); +} + +//static +void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data) +{ + LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data; + + if (ctrl->getName() == "KeywordsOn") + { + bool enabled = self->childGetValue("KeywordsOn").asBoolean(); + self->childSetEnabled("KeywordsList", enabled); + self->childSetEnabled("KeywordsInChat", enabled); + self->childSetEnabled("KeywordsInIM", enabled); + self->childSetEnabled("KeywordsChangeColor", enabled); + self->childSetEnabled("KeywordsColor", enabled); + self->childSetEnabled("KeywordsPlaySound", enabled); + self->childSetEnabled("KeywordsSound", enabled); + } + + gSavedPerAccountSettings.setBOOL("KeywordsOn", self->childGetValue("KeywordsOn")); + gSavedPerAccountSettings.setString("KeywordsList", self->childGetValue("KeywordsList")); + gSavedPerAccountSettings.setBOOL("KeywordsInChat", self->childGetValue("KeywordsInChat")); + gSavedPerAccountSettings.setBOOL("KeywordsInIM", self->childGetValue("KeywordsInIM")); + gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", self->childGetValue("KeywordsChangeColor")); + gSavedPerAccountSettings.setColor4("KeywordsColor", self->childGetValue("KeywordsColor")); + gSavedPerAccountSettings.setBOOL("KeywordsPlaySound", self->childGetValue("KeywordsPlaySound")); + gSavedPerAccountSettings.setString("KeywordsSound", self->childGetValue("KeywordsSound")); +} + +// Store current settings for cancel void LLPrefsAscentChat::refreshValues() { //Chat/IM ----------------------------------------------------------------------------- @@ -193,6 +239,7 @@ void LLPrefsAscentChat::refreshValues() mKeywordsSound = static_cast(gSavedPerAccountSettings.getString("KeywordsSound")); } +// Update controls based on current settings void LLPrefsAscentChat::refresh() { //Chat -------------------------------------------------------------------------------- @@ -277,28 +324,28 @@ void LLPrefsAscentChat::refresh() combo->setSimple(std::string("")); } - bool enabled = childGetValue("Keywords_Alert").asBoolean(); - childSetEnabled("Keywords_Entries", enabled); - childSetEnabled("Keywords_LocalChat", enabled); - childSetEnabled("Keywords_IM", enabled); - childSetEnabled("Keywords_Highlight", enabled); - childSetEnabled("Keywords_Color", enabled); - childSetEnabled("Keywords_PlaySound", enabled); - childSetEnabled("Keywords_SoundUUID", enabled); + childSetEnabled("KeywordsList", mKeywordsOn); + childSetEnabled("KeywordsInChat", mKeywordsOn); + childSetEnabled("KeywordsInIM", mKeywordsOn); + childSetEnabled("KeywordsChangeColor", mKeywordsOn); + childSetEnabled("KeywordsColor", mKeywordsOn); + childSetEnabled("KeywordsPlaySound", mKeywordsOn); + childSetEnabled("KeywordsSound", mKeywordsOn); - childSetValue("Keywords_Alert", mKeywordsOn); - childSetValue("Keywords_Entries", mKeywordsList); - childSetValue("Keywords_LocalChat", mKeywordsInChat); - childSetValue("Keywords_IM", mKeywordsInIM); - childSetValue("Keywords_Highlight", mKeywordsChangeColor); + childSetValue("KeywordsOn", mKeywordsOn); + childSetValue("KeywordsList", mKeywordsList); + childSetValue("KeywordsInChat", mKeywordsInChat); + childSetValue("KeywordsInIM", mKeywordsInIM); + childSetValue("KeywordsChangeColor", mKeywordsChangeColor); - LLColorSwatchCtrl* colorctrl = getChild("Keywords_Color"); + LLColorSwatchCtrl* colorctrl = getChild("KeywordsColor"); colorctrl->set(LLColor4(mKeywordsColor),TRUE); - childSetValue("Keywords_PlaySound", mKeywordsPlaySound); - childSetValue("Keywords_SoundUUID", mKeywordsSound); + childSetValue("KeywordsPlaySound", mKeywordsPlaySound); + childSetValue("KeywordsSound", mKeywordsSound); } +// Reset settings to local copy void LLPrefsAscentChat::cancel() { //Chat/IM ----------------------------------------------------------------------------- @@ -383,6 +430,7 @@ void LLPrefsAscentChat::cancel() gSavedPerAccountSettings.setString("KeywordsSound", mKeywordsSound.asString()); } +// Update local copy so cancel has no effect void LLPrefsAscentChat::apply() { //Chat/IM ----------------------------------------------------------------------------- @@ -438,25 +486,6 @@ void LLPrefsAscentChat::apply() gSavedSettings.setString("LongTimeFormat", long_time); gSavedSettings.setString("TimestampFormat", timestamp); - gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone", mIMResponseAnyone); - gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", mIMResponseFriends); - gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", mIMResponseMuted); - gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping", mIMShowOnTyping); - gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded", mIMShowResponded); - gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", mIMResponseRepeat); - gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", mIMResponseItem); - gSavedPerAccountSettings.setString("AscentInstantMessageResponse", mIMResponseText); - - //Text Options ------------------------------------------------------------------------ - gSavedPerAccountSettings.setBOOL("KeywordsOn", mKeywordsOn); - gSavedPerAccountSettings.setString("KeywordsList", mKeywordsList); - gSavedPerAccountSettings.setBOOL("KeywordsInChat", mKeywordsInChat); - gSavedPerAccountSettings.setBOOL("KeywordsInIM", mKeywordsInIM); - gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", mKeywordsChangeColor); - gSavedPerAccountSettings.setColor4("KeywordsColor", mKeywordsColor); - gSavedPerAccountSettings.setBOOL("KeywordsPlaySound", mKeywordsPlaySound); - gSavedPerAccountSettings.setString("KeywordsSound", mKeywordsSound.asString()); - refreshValues(); refresh(); } diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h index ddf26b7b9..8b7b1f436 100644 --- a/indra/newview/ascentprefschat.h +++ b/indra/newview/ascentprefschat.h @@ -48,12 +48,13 @@ public: void refreshValues(); protected: - static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); static void onSpellAdd(void* data); static void onSpellRemove(void* data); static void onSpellGetMore(void* data); static void onSpellEditCustom(void* data); static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata); + static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data); + static void onCommitKeywords(LLUICtrl* ctrl, void* user_data); //Chat/IM ----------------------------------------------------------------------------- BOOL mWoLfVerticalIMTabs; diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp index 726508558..7aa94bed5 100644 --- a/indra/newview/ascentprefssys.cpp +++ b/indra/newview/ascentprefssys.cpp @@ -54,6 +54,23 @@ LLPrefsAscentSys::LLPrefsAscentSys() childSetCommitCallback("system_folder_check", onCommitCheckBox, this); childSetCommitCallback("show_look_at_check", onCommitCheckBox, this); childSetCommitCallback("enable_clouds", onCommitCheckBox, this); + childSetCommitCallback("power_user_check", onCommitCheckBox, this); + childSetCommitCallback("power_user_confirm_check", onCommitCheckBox, this); + + childSetCommitCallback("chat_cmd_toggle", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLinePos", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineGround", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineHeight", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineTeleportHome", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineRezPlatform", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineCalc", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineClearChat", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineDrawDistance", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdTeleportToCam", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineKeyToName", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineOfferTp", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineMapTo", onCommitCmdLine, this); + childSetCommitCallback("AscentCmdLineTP2", onCommitCmdLine, this); refreshValues(); refresh(); @@ -68,7 +85,7 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) { LLPrefsAscentSys* self = (LLPrefsAscentSys*)user_data; - llinfos << "Change to " << ctrl->getControlName() << " aka " << ctrl->getName() << llendl; +// llinfos << "Change to " << ctrl->getControlName() << " aka " << ctrl->getName() << llendl; if (ctrl->getName() == "speed_rez_check") // Why is this one getControlName() and the rest are getName()? { @@ -92,6 +109,81 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) bool enabled = self->childGetValue("enable_clouds").asBoolean(); self->childSetEnabled("enable_classic_clouds", enabled); } + else if (ctrl->getName() == "power_user_check") + { + bool enabled = self->childGetValue("power_user_check").asBoolean(); + self->childSetEnabled("power_user_confirm_check", enabled); + self->childSetValue("power_user_confirm_check", false); + } + else if (ctrl->getName() == "power_user_confirm_check") + { + bool enabled = self->childGetValue("power_user_confirm_check").asBoolean(); + + gSavedSettings.setBOOL("AscentPowerfulWizard", enabled); + + if (enabled) + { + LLVector3d lpos_global = gAgent.getPositionGlobal(); + gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global); + LLChat chat; + chat.mSourceType = CHAT_SOURCE_SYSTEM; + chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it."); + LLFloaterChat::addChat(chat); + } + } +} + +//static +void LLPrefsAscentSys::onCommitCmdLine(LLUICtrl* ctrl, void* user_data) +{ + LLPrefsAscentSys* self = (LLPrefsAscentSys*)user_data; + + if (ctrl->getName() == "chat_cmd_toggle") + { + bool enabled = self->childGetValue("chat_cmd_toggle").asBoolean(); + self->childSetEnabled("cmd_line_text_2", enabled); + self->childSetEnabled("cmd_line_text_3", enabled); + self->childSetEnabled("cmd_line_text_4", enabled); + self->childSetEnabled("cmd_line_text_5", enabled); + self->childSetEnabled("cmd_line_text_6", enabled); + self->childSetEnabled("cmd_line_text_7", enabled); + self->childSetEnabled("cmd_line_text_8", enabled); + self->childSetEnabled("cmd_line_text_9", enabled); + self->childSetEnabled("cmd_line_text_10", enabled); + self->childSetEnabled("cmd_line_text_11", enabled); + self->childSetEnabled("cmd_line_text_12", enabled); + self->childSetEnabled("cmd_line_text_13", enabled); + self->childSetEnabled("cmd_line_text_15", enabled); + self->childSetEnabled("AscentCmdLinePos", enabled); + self->childSetEnabled("AscentCmdLineGround", enabled); + self->childSetEnabled("AscentCmdLineHeight", enabled); + self->childSetEnabled("AscentCmdLineTeleportHome", enabled); + self->childSetEnabled("AscentCmdLineRezPlatform", enabled); + self->childSetEnabled("AscentPlatformSize", enabled); + self->childSetEnabled("AscentCmdLineCalc", enabled); + self->childSetEnabled("AscentCmdLineClearChat", enabled); + self->childSetEnabled("AscentCmdLineDrawDistance", enabled); + self->childSetEnabled("AscentCmdTeleportToCam", enabled); + self->childSetEnabled("AscentCmdLineKeyToName", enabled); + self->childSetEnabled("AscentCmdLineOfferTp", enabled); + self->childSetEnabled("AscentCmdLineMapTo", enabled); + self->childSetEnabled("map_to_keep_pos", enabled); + self->childSetEnabled("AscentCmdLineTP2", enabled); + } + + gSavedSettings.setString("AscentCmdLinePos", self->childGetValue("AscentCmdLinePos")); + gSavedSettings.setString("AscentCmdLineGround", self->childGetValue("AscentCmdLineGround")); + gSavedSettings.setString("AscentCmdLineHeight", self->childGetValue("AscentCmdLineHeight")); + gSavedSettings.setString("AscentCmdLineTeleportHome", self->childGetValue("AscentCmdLineTeleportHome")); + gSavedSettings.setString("AscentCmdLineRezPlatform", self->childGetValue("AscentCmdLineRezPlatform")); + gSavedSettings.setString("AscentCmdLineCalc", self->childGetValue("AscentCmdLineCalc")); + gSavedSettings.setString("AscentCmdLineClearChat", self->childGetValue("AscentCmdLineClearChat")); + gSavedSettings.setString("AscentCmdLineDrawDistance", self->childGetValue("AscentCmdLineDrawDistance")); + gSavedSettings.setString("AscentCmdTeleportToCam", self->childGetValue("AscentCmdTeleportToCam")); + gSavedSettings.setString("AscentCmdLineKeyToName", self->childGetValue("AscentCmdLineKeyToName")); + gSavedSettings.setString("AscentCmdLineOfferTp", self->childGetValue("AscentCmdLineOfferTp")); + gSavedSettings.setString("AscentCmdLineMapTo", self->childGetValue("AscentCmdLineMapTo")); + gSavedSettings.setString("AscentCmdLineTP2", self->childGetValue("AscentCmdLineTP2")); } void LLPrefsAscentSys::refreshValues() @@ -101,7 +193,7 @@ void LLPrefsAscentSys::refreshValues() mResetCameraAfterTP = gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP"); mOffsetTPByUserHeight = gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight"); mPreviewAnimInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld"); - mSaveScriptsAsMono = gSavedSettings.getBOOL("SaveScriptsAsMono"); +// mSaveScriptsAsMono = gSavedSettings.getBOOL("SaveScriptsAsMono"); mAlwaysRezInGroup = gSavedSettings.getBOOL("AscentAlwaysRezInGroup"); mBuildAlwaysEnabled = gSavedSettings.getBOOL("AscentBuildAlwaysEnabled"); mAlwaysShowFly = gSavedSettings.getBOOL("AscentFlyAlwaysEnabled"); @@ -117,12 +209,13 @@ void LLPrefsAscentSys::refreshValues() mSpeedRezInterval = gSavedSettings.getU32("SpeedRezInterval"); //Command Line ------------------------------------------------------------------------ - mCmdLine = gSavedSettings.getBOOL("chat_cmd_toggle"); + mCmdLine = gSavedSettings.getBOOL("AscentCmdLine"); mCmdLinePos = gSavedSettings.getString("AscentCmdLinePos"); mCmdLineGround = gSavedSettings.getString("AscentCmdLineGround"); mCmdLineHeight = gSavedSettings.getString("AscentCmdLineHeight"); mCmdLineTeleportHome = gSavedSettings.getString("AscentCmdLineTeleportHome"); mCmdLineRezPlatform = gSavedSettings.getString("AscentCmdLineRezPlatform"); + mCmdPlatformSize = gSavedSettings.getF32("AscentPlatformSize"); mCmdLineCalc = gSavedSettings.getString("AscentCmdLineCalc"); mCmdLineClearChat = gSavedSettings.getString("AscentCmdLineClearChat"); mCmdLineDrawDistance = gSavedSettings.getString("AscentCmdLineDrawDistance"); @@ -130,6 +223,7 @@ void LLPrefsAscentSys::refreshValues() mCmdLineKeyToName = gSavedSettings.getString("AscentCmdLineKeyToName"); mCmdLineOfferTp = gSavedSettings.getString("AscentCmdLineOfferTp"); mCmdLineMapTo = gSavedSettings.getString("AscentCmdLineMapTo"); + mCmdMapToKeepPos = gSavedSettings.getBOOL("AscentMapToKeepPos"); mCmdLineTP2 = gSavedSettings.getString("AscentCmdLineTP2"); //Privacy ----------------------------------------------------------------------------- @@ -140,6 +234,7 @@ void LLPrefsAscentSys::refreshValues() mRevokePermsOnStandUp = gSavedSettings.getBOOL("RevokePermsOnStandUp"); mDisableClickSit = gSavedSettings.getBOOL("DisableClickSit"); mDisplayScriptJumps = gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps"); + mNumScriptDiff = gSavedSettings.getF32("Ascentnumscriptdiff"); } void LLPrefsAscentSys::refresh() @@ -149,8 +244,51 @@ void LLPrefsAscentSys::refresh() childSetValue("power_user_check", mPowerUser); childSetValue("power_user_confirm_check", mPowerUser); childSetEnabled("temp_in_system_check", mUseSystemFolder); - childSetEnabled("speed_rez_interval", mSpeedRez); - childSetEnabled("speed_rez_seconds", mSpeedRez); + childSetEnabled("speed_rez_interval", mSpeedRez); + childSetEnabled("speed_rez_seconds", mSpeedRez); + + childSetEnabled("cmd_line_text_2", mCmdLine); + childSetEnabled("cmd_line_text_3", mCmdLine); + childSetEnabled("cmd_line_text_4", mCmdLine); + childSetEnabled("cmd_line_text_5", mCmdLine); + childSetEnabled("cmd_line_text_6", mCmdLine); + childSetEnabled("cmd_line_text_7", mCmdLine); + childSetEnabled("cmd_line_text_8", mCmdLine); + childSetEnabled("cmd_line_text_9", mCmdLine); + childSetEnabled("cmd_line_text_10", mCmdLine); + childSetEnabled("cmd_line_text_11", mCmdLine); + childSetEnabled("cmd_line_text_12", mCmdLine); + childSetEnabled("cmd_line_text_13", mCmdLine); + childSetEnabled("cmd_line_text_15", mCmdLine); + childSetEnabled("AscentCmdLinePos", mCmdLine); + childSetEnabled("AscentCmdLineGround", mCmdLine); + childSetEnabled("AscentCmdLineHeight", mCmdLine); + childSetEnabled("AscentCmdLineTeleportHome", mCmdLine); + childSetEnabled("AscentCmdLineRezPlatform", mCmdLine); + childSetEnabled("AscentPlatformSize", mCmdLine); + childSetEnabled("AscentCmdLineCalc", mCmdLine); + childSetEnabled("AscentCmdLineClearChat", mCmdLine); + childSetEnabled("AscentCmdLineDrawDistance", mCmdLine); + childSetEnabled("AscentCmdTeleportToCam", mCmdLine); + childSetEnabled("AscentCmdLineKeyToName", mCmdLine); + childSetEnabled("AscentCmdLineOfferTp", mCmdLine); + childSetEnabled("AscentCmdLineMapTo", mCmdLine); + childSetEnabled("map_to_keep_pos", mCmdLine); + childSetEnabled("AscentCmdLineTP2", mCmdLine); + + childSetValue("AscentCmdLinePos", mCmdLinePos); + childSetValue("AscentCmdLineGround", mCmdLineGround); + childSetValue("AscentCmdLineHeight", mCmdLineHeight); + childSetValue("AscentCmdLineTeleportHome", mCmdLineTeleportHome); + childSetValue("AscentCmdLineRezPlatform", mCmdLineRezPlatform); + childSetValue("AscentCmdLineCalc", mCmdLineCalc); + childSetValue("AscentCmdLineClearChat", mCmdLineClearChat); + childSetValue("AscentCmdLineDrawDistance", mCmdLineDrawDistance); + childSetValue("AscentCmdTeleportToCam", mCmdTeleportToCam); + childSetValue("AscentCmdLineKeyToName", mCmdLineKeyToName); + childSetValue("AscentCmdLineOfferTp", mCmdLineOfferTp); + childSetValue("AscentCmdLineMapTo", mCmdLineMapTo); + childSetValue("AscentCmdLineTP2", mCmdLineTP2); } void LLPrefsAscentSys::cancel() @@ -160,7 +298,7 @@ void LLPrefsAscentSys::cancel() gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP); gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight); gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld); - gSavedSettings.setBOOL("SaveScriptsAsMono", mSaveScriptsAsMono); +// gSavedSettings.setBOOL("SaveScriptsAsMono", mSaveScriptsAsMono); gSavedSettings.setBOOL("AscentAlwaysRezInGroup", mAlwaysRezInGroup); gSavedSettings.setBOOL("AscentBuildAlwaysEnabled", mBuildAlwaysEnabled); gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", mAlwaysShowFly); @@ -176,12 +314,13 @@ void LLPrefsAscentSys::cancel() gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval); //Command Line ------------------------------------------------------------------------ - gSavedSettings.setBOOL("chat_cmd_toggle", mCmdLine); + gSavedSettings.setBOOL("AscentCmdLine", mCmdLine); gSavedSettings.setString("AscentCmdLinePos", mCmdLinePos); gSavedSettings.setString("AscentCmdLineGround", mCmdLineGround); gSavedSettings.setString("AscentCmdLineHeight", mCmdLineHeight); gSavedSettings.setString("AscentCmdLineTeleportHome", mCmdLineTeleportHome); gSavedSettings.setString("AscentCmdLineRezPlatform", mCmdLineRezPlatform); + gSavedSettings.setF32("AscentPlatformSize", mCmdPlatformSize); gSavedSettings.setString("AscentCmdLineCalc", mCmdLineCalc); gSavedSettings.setString("AscentCmdLineClearChat", mCmdLineClearChat); gSavedSettings.setString("AscentCmdLineDrawDistance", mCmdLineDrawDistance); @@ -189,6 +328,7 @@ void LLPrefsAscentSys::cancel() gSavedSettings.setString("AscentCmdLineKeyToName", mCmdLineKeyToName); gSavedSettings.setString("AscentCmdLineOfferTp", mCmdLineOfferTp); gSavedSettings.setString("AscentCmdLineMapTo", mCmdLineMapTo); + gSavedSettings.setBOOL("AscentMapToKeepPos", mCmdMapToKeepPos); gSavedSettings.setString("AscentCmdLineTP2", mCmdLineTP2); //Privacy ----------------------------------------------------------------------------- @@ -199,40 +339,11 @@ void LLPrefsAscentSys::cancel() gSavedSettings.setBOOL("RevokePermsOnStandUp", mRevokePermsOnStandUp); gSavedSettings.setBOOL("DisableClickSit", mDisableClickSit); gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps); + gSavedSettings.setF32("Ascentnumscriptdiff", mNumScriptDiff); } void LLPrefsAscentSys::apply() { - std::string short_date, long_date, short_time, long_time, timestamp; - - //General ------------------------------------------------------------------------------ - gSavedSettings.setBOOL("AscentPowerfulWizard", (childGetValue("power_user_check") && childGetValue("power_user_confirm_check"))); - - if (gSavedSettings.getBOOL("AscentPowerfulWizard") && !mPowerUser) - { - LLVector3d lpos_global = gAgent.getPositionGlobal(); - gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global); - LLChat chat; - chat.mSourceType = CHAT_SOURCE_SYSTEM; - chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it."); - LLFloaterChat::addChat(chat); - } - - //Commandline ---------------------------------------------------------------------------- - gSavedSettings.setString("AscentCmdLinePos", childGetValue("AscentCmdLinePos")); - gSavedSettings.setString("AscentCmdLineGround", childGetValue("AscentCmdLineGround")); - gSavedSettings.setString("AscentCmdLineHeight", childGetValue("AscentCmdLineHeight")); - gSavedSettings.setString("AscentCmdLineTeleportHome", childGetValue("AscentCmdLineTeleportHome")); - gSavedSettings.setString("AscentCmdLineRezPlatform", childGetValue("AscentCmdLineRezPlatform")); - gSavedSettings.setString("AscentCmdLineCalc", childGetValue("AscentCmdLineCalc")); - gSavedSettings.setString("AscentCmdLineClearChat", childGetValue("AscentCmdLineClearChat")); - gSavedSettings.setString("AscentCmdLineDrawDistance", childGetValue("AscentCmdLineDrawDistance")); - gSavedSettings.setString("AscentCmdTeleportToCam", childGetValue("AscentCmdTeleportToCam")); - gSavedSettings.setString("AscentCmdLineKeyToName", childGetValue("AscentCmdLineKeyToName")); - gSavedSettings.setString("AscentCmdLineOfferTp", childGetValue("AscentCmdLineOfferTp")); - gSavedSettings.setString("AscentCmdLineMapTo", childGetValue("AscentCmdLineMapTo")); - gSavedSettings.setString("AscentCmdLineTP2", childGetValue("AscentCmdLineTP2")); - refreshValues(); refresh(); } diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h index 3698686ad..0137ddd29 100644 --- a/indra/newview/ascentprefssys.h +++ b/indra/newview/ascentprefssys.h @@ -39,61 +39,65 @@ class LLPrefsAscentSys : public LLPanel { public: - LLPrefsAscentSys(); - ~LLPrefsAscentSys(); + LLPrefsAscentSys(); + ~LLPrefsAscentSys(); - void apply(); - void cancel(); + void apply(); + void cancel(); void refresh(); - void refreshValues(); + void refreshValues(); protected: - static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); + static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); + static void onCommitCmdLine(LLUICtrl* ctrl, void* user_data); //General ----------------------------------------------------------------------------- - BOOL mDoubleClickTeleport; - BOOL mResetCameraAfterTP; - BOOL mOffsetTPByUserHeight; - BOOL mPreviewAnimInWorld; - BOOL mSaveScriptsAsMono; - BOOL mAlwaysRezInGroup; - BOOL mBuildAlwaysEnabled; - BOOL mAlwaysShowFly; - BOOL mDisableMinZoom; - BOOL mPowerUser; - BOOL mUseSystemFolder; - BOOL mUploadToSystem; - BOOL mFetchInventoryOnLogin; - BOOL mEnableLLWind; - BOOL mEnableClouds; - BOOL mEnableClassicClouds; - BOOL mSpeedRez; - U32 mSpeedRezInterval; + BOOL mDoubleClickTeleport; + BOOL mResetCameraAfterTP; + BOOL mOffsetTPByUserHeight; + BOOL mPreviewAnimInWorld; +// BOOL mSaveScriptsAsMono; + BOOL mAlwaysRezInGroup; + BOOL mBuildAlwaysEnabled; + BOOL mAlwaysShowFly; + BOOL mDisableMinZoom; + BOOL mPowerUser; + BOOL mUseSystemFolder; + BOOL mUploadToSystem; + BOOL mFetchInventoryOnLogin; + BOOL mEnableLLWind; + BOOL mEnableClouds; + BOOL mEnableClassicClouds; + BOOL mSpeedRez; + U32 mSpeedRezInterval; //Command Line ------------------------------------------------------------------------ BOOL mCmdLine; - std::string mCmdLinePos; - std::string mCmdLineGround; - std::string mCmdLineHeight; - std::string mCmdLineTeleportHome; - std::string mCmdLineRezPlatform; - std::string mCmdLineCalc; - std::string mCmdLineClearChat; - std::string mCmdLineDrawDistance; - std::string mCmdTeleportToCam; - std::string mCmdLineKeyToName; - std::string mCmdLineOfferTp; - std::string mCmdLineMapTo; - std::string mCmdLineTP2; + std::string mCmdLinePos; + std::string mCmdLineGround; + std::string mCmdLineHeight; + std::string mCmdLineTeleportHome; + std::string mCmdLineRezPlatform; + F32 mCmdPlatformSize; + std::string mCmdLineCalc; + std::string mCmdLineClearChat; + std::string mCmdLineDrawDistance; + std::string mCmdTeleportToCam; + std::string mCmdLineKeyToName; + std::string mCmdLineOfferTp; + std::string mCmdLineMapTo; + BOOL mCmdMapToKeepPos; + std::string mCmdLineTP2; //Privacy ----------------------------------------------------------------------------- - BOOL mBroadcastViewerEffects; - BOOL mDisablePointAtAndBeam; - BOOL mPrivateLookAt; - BOOL mShowLookAt; - BOOL mRevokePermsOnStandUp; - BOOL mDisableClickSit; + BOOL mBroadcastViewerEffects; + BOOL mDisablePointAtAndBeam; + BOOL mPrivateLookAt; + BOOL mShowLookAt; + BOOL mRevokePermsOnStandUp; + BOOL mDisableClickSit; BOOL mDisplayScriptJumps; + F32 mNumScriptDiff; }; #endif diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp index 7996fb106..a6e66f77e 100644 --- a/indra/newview/ascentprefsvan.cpp +++ b/indra/newview/ascentprefsvan.cpp @@ -49,87 +49,78 @@ #include "llviewernetwork.h" #include "pipeline.h" -class LLPrefsAscentVanImpl : public LLPanel -{ -public: - LLPrefsAscentVanImpl(); - /*virtual*/ ~LLPrefsAscentVanImpl() { }; - virtual void refresh(); - - void apply(); - void cancel(); - -private: - static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); - static void onCommitColor(LLUICtrl* ctrl, void* user_data); - static void onManualClientUpdate(void* data); - void refreshValues(); - //General - BOOL mUseAccountSettings; - BOOL mShowTPScreen; - BOOL mPlayTPSound; - BOOL mShowLogScreens; - //Colors - BOOL mShowSelfClientTag; - BOOL mShowSelfClientTagColor; - BOOL mCustomTagOn; - std::string mCustomTagLabel; - LLColor4 mCustomTagColor; - LLColor4 mEffectColor; - LLColor4 mFriendColor; - LLColor4 mLindenColor; - LLColor4 mMutedColor; - LLColor4 mEMColor; - U32 mSelectedClient; -}; - - -LLPrefsAscentVanImpl::LLPrefsAscentVanImpl() - : LLPanel(std::string("Ascent")) +LLPrefsAscentVan::LLPrefsAscentVan() { LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml"); - childSetCommitCallback("use_account_settings_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_color_swatch", onCommitColor, this); - childSetCommitCallback("effect_color_swatch", onCommitColor, this); + childSetCommitCallback("custom_tag_label_box", onCommitTextModified, this); +// childSetCommitCallback("custom_tag_color_swatch", onCommitColor, this); + + childSetCommitCallback("X Modifier", onCommitUpdateAvatarOffsets); + childSetCommitCallback("Y Modifier", onCommitUpdateAvatarOffsets); + childSetCommitCallback("Z Modifier", onCommitUpdateAvatarOffsets); - childSetCommitCallback("X Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets); - childSetCommitCallback("Y Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets); - childSetCommitCallback("Z Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets); - childSetAction("update_clientdefs", onManualClientUpdate, this); + + refreshValues(); refresh(); - } +LLPrefsAscentVan::~LLPrefsAscentVan() +{ +} + +//static void LLPrefsAscentVan::onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata) { - gAgent.sendAgentSetAppearance(); - //llinfos << llformat("%d,%d,%d",gSavedSettings.getF32("EmeraldAvatarXModifier"),gSavedSettings.getF32("EmeraldAvatarYModifier"),gSavedSettings.getF32("EmeraldAvatarZModifier")) << llendl; + if (!gAgent.getID().isNull()) + { + gAgent.sendAgentSetAppearance(); + } } -void LLPrefsAscentVanImpl::onCommitColor(LLUICtrl* ctrl, void* user_data) +//static +void LLPrefsAscentVan::onCommitTextModified(LLUICtrl* ctrl, void* userdata) { - LLPrefsAscentVanImpl* self = (LLPrefsAscentVanImpl*)user_data; + 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")); - gAgent.sendAgentSetAppearance(); - gAgent.resetClientTag(); +// gSavedSettings.setColor4("AscentCustomTagColor", self->childGetValue("custom_tag_color_swatch")); + + if (!gAgent.getID().isNull()) + { + gAgent.sendAgentSetAppearance(); + gAgent.resetClientTag(); + } } } - -void LLPrefsAscentVanImpl::onManualClientUpdate(void* data) +*/ +//static +void LLPrefsAscentVan::onManualClientUpdate(void* data) { LLChat chat; chat.mSourceType = CHAT_SOURCE_SYSTEM; @@ -150,22 +141,21 @@ void LLPrefsAscentVanImpl::onManualClientUpdate(void* data) } } LLFloaterChat::addChat(chat); - } //static -void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) +void LLPrefsAscentVan::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) { - - LLPrefsAscentVanImpl* self = (LLPrefsAscentVanImpl*)user_data; + LLPrefsAscentVan* self = (LLPrefsAscentVan*)user_data; - llinfos << "Control named " << ctrl->getControlName() << llendl; - if (ctrl->getControlName() == "AscentStoreSettingsPerAccount") +// llinfos << "Control named " << ctrl->getControlName() << llendl; +/* + if (ctrl->getControlName() == "AscentStoreSettingsPerAccount") { self->refresh(); } - - if ((ctrl->getName() == "show_friend_tag_check")||(ctrl->getName() == "use_status_check")) +*/ + if (ctrl->getName() == "show_friend_tag_check") { for (std::vector::iterator iter = LLCharacter::sInstances.begin(); iter != LLCharacter::sInstances.end(); ++iter) @@ -178,125 +168,176 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) } } } + 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 = ""; + } + } - BOOL showCustomOptions; - showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag"); - self->childSetValue("customize_own_tag_check", showCustomOptions); - 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()) + 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); + } + 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); + } + + if (!gAgent.getID().isNull()) + { + gAgent.sendAgentSetAppearance(); gAgent.resetClientTag(); + } } -void LLPrefsAscentVanImpl::refreshValues() +// 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"); - - //Colors - mShowSelfClientTag = gSavedSettings.getBOOL("AscentShowSelfTag"); - mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor"); - mCustomTagOn = gSavedSettings.getBOOL("AscentUseCustomTag"); + //General -------------------------------------------------------------------------------- + mUseAccountSettings = gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"); + mShowTPScreen = !gSavedSettings.getBOOL("AscentDisableTeleportScreens"); + mPlayTPSound = gSavedSettings.getBOOL("OptionPlayTpSound"); + mShowLogScreens = !gSavedSettings.getBOOL("AscentDisableLogoutScreens"); + //Tags\Colors ---------------------------------------------------------------------------- + mAscentUseTag = gSavedSettings.getBOOL("AscentUseTag"); + mReportClientUUID = gSavedSettings.getString("AscentReportClientUUID"); mSelectedClient = gSavedSettings.getU32("AscentReportClientIndex"); - mEffectColor = gSavedSettings.getColor4("EffectColor"); - - childSetEnabled("custom_tag_label_text", mCustomTagOn); - childSetEnabled("custom_tag_label_box", mCustomTagOn); - childSetEnabled("custom_tag_color_text", mCustomTagOn); - childSetEnabled("custom_tag_color_swatch", mCustomTagOn); - + mShowSelfClientTag = gSavedSettings.getBOOL("AscentShowSelfTag"); + mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor"); + mShowFriendsTag = gSavedSettings.getBOOL("AscentShowFriendsTag"); + 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"); - mEMColor = gSavedSettings.getColor4("AscentEstateOwnerColor"); //mCustomColor = gSavedSettings.getColor4("MoyMiniMapCustomColor"); + + //Body Dynamics -------------------------------------------------------------------------- + mBreastPhysicsToggle = gSavedSettings.getBOOL("EmeraldBreastPhysicsToggle"); + mBoobMass = gSavedSettings.getF32("EmeraldBoobMass"); + mBoobHardness = gSavedSettings.getF32("EmeraldBoobHardness"); + mBoobVelMax = gSavedSettings.getF32("EmeraldBoobVelMax"); + mBoobFriction = gSavedSettings.getF32("EmeraldBoobFriction"); + mBoobVelMin = gSavedSettings.getF32("EmeraldBoobVelMin"); + + mAvatarXModifier = gSavedSettings.getF32("AscentAvatarXModifier"); + mAvatarYModifier = gSavedSettings.getF32("AscentAvatarYModifier"); + mAvatarZModifier = gSavedSettings.getF32("AscentAvatarZModifier"); } -void LLPrefsAscentVanImpl::refresh() +// Update controls based on current settings +void LLPrefsAscentVan::refresh() { - refreshValues(); //General -------------------------------------------------------------------------------- - childSetValue("use_account_settings_check", mUseAccountSettings); - childSetValue("disable_tp_screen_check", mShowTPScreen); - childSetValue("tp_sound_check", mPlayTPSound); - childSetValue("disable_logout_screen_check", mShowLogScreens); - //Colors --------------------------------------------------------------------------------- + //Tags\Colors ---------------------------------------------------------------------------- LLComboBox* combo = getChild("tag_spoofing_combobox"); combo->setCurrentByIndex(mSelectedClient); - - childSetValue("show_self_tag_check", mShowSelfClientTag); - childSetValue("show_self_tag_color_check", mShowSelfClientTagColor); - childSetValue("customize_own_tag_check", mCustomTagOn); - childSetValue("custom_tag_label_box", mCustomTagLabel); - +/* 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("em_color_swatch")->set(mEMColor); + getChild("estate_owner_color_swatch")->set(mEstateOwnerColor); //getChild("custom_color_swatch")->set(mCustomColor); - gSavedSettings.setColor4("EffectColor", LLColor4::white); - gSavedSettings.setColor4("EffectColor", mEffectColor); - - gSavedSettings.setColor4("AscentFriendColor", LLColor4::white); - gSavedSettings.setColor4("AscentFriendColor", mFriendColor); +*/ + 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); - gSavedSettings.setColor4("AscentLindenColor", LLColor4::white); - gSavedSettings.setColor4("AscentLindenColor", mLindenColor); + 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); - gSavedSettings.setColor4("AscentMutedColor", LLColor4::white); - gSavedSettings.setColor4("AscentMutedColor", mMutedColor); - - gSavedSettings.setColor4("AscentEstateOwnerColor", LLColor4::white); - gSavedSettings.setColor4("AscentEstateOwnerColor", mEMColor); - - //gSavedSettings.setColor4("MoyMiniMapCustomColor", LLColor4::white); - //gSavedSettings.setColor4("MoyMiniMapCustomColor", mCustomColor); - gAgent.resetClientTag(); + //Body Dynamics -------------------------------------------------------------------------- + childSetEnabled("EmeraldBoobMass", mBreastPhysicsToggle); + childSetEnabled("EmeraldBoobHardness", mBreastPhysicsToggle); + childSetEnabled("EmeraldBoobVelMax", mBreastPhysicsToggle); + childSetEnabled("EmeraldBoobFriction", mBreastPhysicsToggle); + childSetEnabled("EmeraldBoobVelMin", mBreastPhysicsToggle); } -void LLPrefsAscentVanImpl::cancel() +// Reset settings to local copy +void LLPrefsAscentVan::cancel() { //General -------------------------------------------------------------------------------- - childSetValue("use_account_settings_check", mUseAccountSettings); - childSetValue("disable_tp_screen_check", mShowTPScreen); - childSetValue("tp_sound_check", mPlayTPSound); - childSetValue("disable_logout_screen_check", mShowLogScreens); + gSavedSettings.setBOOL("AscentStoreSettingsPerAccount", mUseAccountSettings); + gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen); + gSavedSettings.setBOOL("OptionPlayTpSound", mPlayTPSound); + gSavedSettings.setBOOL("AscentDisableLogoutScreens", !mShowLogScreens); - gSavedSettings.setColor4("EffectColor", LLColor4::white); - gSavedSettings.setColor4("EffectColor", mEffectColor); - gSavedSettings.setColor4("AscentFriendColor", LLColor4::yellow); - gSavedSettings.setColor4("AscentFriendColor", mFriendColor); - gSavedSettings.setColor4("AscentLindenColor", LLColor4::yellow); - gSavedSettings.setColor4("AscentLindenColor", mLindenColor); - gSavedSettings.setColor4("AscentMutedColor", LLColor4::yellow); - gSavedSettings.setColor4("AscentMutedColor", mMutedColor); - gSavedSettings.setColor4("AscentEstateOwnerColor", LLColor4::yellow); - gSavedSettings.setColor4("AscentEstateOwnerColor", mEMColor); - //gSavedSettings.setColor4("MoyMiniMapCustomColor", LLColor4::yellow); - //gSavedSettings.setColor4("MoyMiniMapCustomColor", mCustomColor); + //Tags\Colors ---------------------------------------------------------------------------- + gSavedSettings.setBOOL("AscentUseTag", mAscentUseTag); + gSavedSettings.setString("AscentReportClientUUID", mReportClientUUID); + gSavedSettings.setU32("AscentReportClientIndex", mSelectedClient); + gSavedSettings.setBOOL("AscentShowSelfTag", mShowSelfClientTag); + gSavedSettings.setBOOL("AscentShowSelfTagColor", mShowSelfClientTagColor); + gSavedSettings.setBOOL("AscentShowFriendsTag", mShowFriendsTag); + 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("MoyMiniMapCustomColor", mCustomColor); + + //Body Dynamics -------------------------------------------------------------------------- + gSavedSettings.setBOOL("EmeraldBreastPhysicsToggle", mBreastPhysicsToggle); + gSavedSettings.setF32("EmeraldBoobMass", mBoobMass); + gSavedSettings.setF32("EmeraldBoobHardness", mBoobHardness); + gSavedSettings.setF32("EmeraldBoobVelMax", mBoobVelMax); + gSavedSettings.setF32("EmeraldBoobFriction", mBoobFriction); + gSavedSettings.setF32("EmeraldBoobVelMin", mBoobVelMin); + + gSavedSettings.setF32("AscentAvatarXModifier", mAvatarXModifier); + gSavedSettings.setF32("AscentAvatarYModifier", mAvatarYModifier); + gSavedSettings.setF32("AscentAvatarZModifier", mAvatarZModifier); } -void LLPrefsAscentVanImpl::apply() +// Update local copy so cancel has no effect +void LLPrefsAscentVan::apply() { std::string client_uuid; U32 client_index; - //General ----------------------------------------------------------------------------- - gSavedSettings.setBOOL("AscentDisableTeleportScreens", !childGetValue("disable_tp_screen_check")); - gSavedSettings.setBOOL("OptionPlayTpSound", childGetValue("tp_sound_check")); - gSavedSettings.setBOOL("AscentDisableLogoutScreens", !childGetValue("disable_logout_screen_check")); - //Colors ------------------------------------------------------------------------------ + //General ----------------------------------------------------------------------------- + + //Tags\Colors ------------------------------------------------------------------------- LLComboBox* combo = getChild("tag_spoofing_combobox"); if (combo) { @@ -315,45 +356,9 @@ void LLPrefsAscentVanImpl::apply() avatar->forceBakeAllTextures(slam_for_debug); } } - gSavedSettings.setBOOL("AscentShowSelfTag", childGetValue("show_self_tag_check")); - gSavedSettings.setBOOL("AscentShowSelfTagColor", childGetValue("show_self_tag_color_check")); - gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); - gSavedSettings.setColor4("AscentFriendColor", childGetValue("friend_color_swatch")); - gSavedSettings.setColor4("AscentLindenColor", childGetValue("linden_color_swatch")); - gSavedSettings.setColor4("AscentMutedColor", childGetValue("muted_color_swatch")); - gSavedSettings.setColor4("AscentEstateOwnerColor", childGetValue("em_color_swatch")); - gSavedSettings.setColor4("MoyMiniMapCustomColor", childGetValue("custom_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")); - + //Body Dynamics ----------------------------------------------------------------------- + refreshValues(); -} - -//--------------------------------------------------------------------------- - -LLPrefsAscentVan::LLPrefsAscentVan() -: impl(* new LLPrefsAscentVanImpl()) -{ -} - -LLPrefsAscentVan::~LLPrefsAscentVan() -{ - delete &impl; -} - -void LLPrefsAscentVan::apply() -{ - impl.apply(); -} - -void LLPrefsAscentVan::cancel() -{ - impl.cancel(); -} - -LLPanel* LLPrefsAscentVan::getPanel() -{ - return &impl; + refresh(); } diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h index 0cd18d98f..a743a0c88 100644 --- a/indra/newview/ascentprefsvan.h +++ b/indra/newview/ascentprefsvan.h @@ -34,10 +34,8 @@ #include "llpanel.h" -class LLPanel; -class LLPrefsAscentVanImpl; -class LLPrefsAscentVan +class LLPrefsAscentVan : public LLPanel { public: LLPrefsAscentVan(); @@ -45,16 +43,55 @@ public: void apply(); void cancel(); + void refresh(); + void refreshValues(); - LLPanel* getPanel(); - - static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata); +// LLPanel* getPanel(); protected: - LLPrefsAscentVanImpl& impl; + 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 + BOOL mAscentUseTag; + std::string mReportClientUUID; + U32 mSelectedClient; + BOOL mShowSelfClientTag; + BOOL mShowSelfClientTagColor; + BOOL mShowFriendsTag; + BOOL mCustomTagOn; + std::string mCustomTagLabel; + LLColor4 mCustomTagColor; + BOOL mShowOthersTag; + BOOL mShowOthersTagColor; + BOOL mShowIdleTime; + BOOL mUseStatusColors; + BOOL mUpdateTagsOnLoad; + LLColor4 mEffectColor; + LLColor4 mFriendColor; + LLColor4 mEstateOwnerColor; + LLColor4 mLindenColor; + LLColor4 mMutedColor; + //Body Dynamics + BOOL mBreastPhysicsToggle; + F32 mBoobMass; + F32 mBoobHardness; + F32 mBoobVelMax; + F32 mBoobFriction; + F32 mBoobVelMin; + F32 mAvatarXModifier; + F32 mAvatarYModifier; + F32 mAvatarZModifier; private: - + }; #endif diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index c0b57211b..231d680a0 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -214,8 +214,8 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def mPrefsAscentSys->setDefaultBtn(default_btn); mPrefsAscentVan = new LLPrefsAscentVan(); - mTabContainer->addTabPanel(mPrefsAscentVan->getPanel(), mPrefsAscentVan->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer); - mPrefsAscentVan->getPanel()->setDefaultBtn(default_btn); + mTabContainer->addTabPanel(mPrefsAscentVan, mPrefsAscentVan->getLabel(), FALSE, onTabChanged, mTabContainer); + mPrefsAscentVan->setDefaultBtn(default_btn); if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab"))) { diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8115bca09..037e1b323 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1746,7 +1746,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) bool typing_init = false; if( dialog == IM_TYPING_START && !is_muted ) { - if(!gIMMgr->hasSession(computed_session_id) && gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming")) + if(!gIMMgr->hasSession(computed_session_id) && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming")) { typing_init = true; gIMMgr->addMessage( @@ -1800,7 +1800,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // [/RLVa:KB] { if((dialog == IM_NOTHING_SPECIAL && !is_auto_response) || - (dialog == IM_TYPING_START && gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming")) + (dialog == IM_TYPING_START && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming")) ) { BOOL has = gIMMgr->hasSession(computed_session_id); diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml index f75a79267..15436edfe 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml @@ -159,7 +159,7 @@ MM/DD/YYYY - @@ -273,30 +273,30 @@ To use spellcheck, right-click a misspelled word + name="KeywordsOn" radio_style="false" width="270"/> (separated by commas) + font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="KeywordsList" width="300" /> Is found within: + label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="KeywordsInChat" radio_style="false" width="270"/> + label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="KeywordsInIM" radio_style="false" width="270"/> + color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210" mouse_opaque="true" + name="KeywordsColor" tool_tip="Click to open Color Picker" width="50"/> + font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="KeywordsSound" width="300" /> diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml index 4ec36f23e..b2027fbed 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml @@ -30,7 +30,7 @@ tool_tip="The Animation upload window will play animations on your avatar when previewing them." mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false" width="400" /> - - - @@ -137,37 +137,35 @@ Teleport within sim (usage: cmd x y z) + tool_tip="" name="AscentCmdLinePos" width="200"/> Teleport to ground (usage: cmd) + tool_tip="" name="AscentCmdLineGround" width="200"/> Teleport to altitude (usage: cmd z) + tool_tip="" name="AscentCmdLineHeight" width="200"/> Teleport home (usage: cmd) + tool_tip="" name="AscentCmdLineTeleportHome" width="200"/> Rez a platform (usage: cmd 0 - 30) + tool_tip="" name="AscentCmdLineRezPlatform" width="200"/> + tool_tip="" name="AscentCmdLineCalc" width="200"/> Clear the chat history (usage: cmd) @@ -186,7 +184,7 @@ Clear the chat history (usage: cmd) + name="AscentCmdLineClearChat" width="200"/> @@ -196,38 +194,35 @@ Change Draw Distance (usage: cmd meters) + tool_tip="" name="AscentCmdLineDrawDistance" width="200"/> Teleport to cam position (usage: cmd) + tool_tip="" name="AscentCmdTeleportToCam" width="200"/> Get avatar name from key (usage: cmd key) + tool_tip="" name="AscentCmdLineKeyToName" width="200"/> Offer teleport to avatar (usage: cmd key) + tool_tip="" name="AscentCmdLineOfferTp" width="200"/> Teleport to sim x (usage: cmd simname) + tool_tip="" name="AscentCmdLineMapTo" width="200"/> + name="AscentCmdLineTP2" width="200"/> - 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 496845b2a..f2ff019e8 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 @@ -31,15 +31,13 @@ width="400" /> + follows="left|top|right|bottom" label="Tags\Colors" name="Tags\Colors"> - - - Label: +Label: - Color: +Color: -