diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 52d672edd..f9524946b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24,6 +24,39 @@ Value 100.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 + Ascentnumscripts Comment @@ -112,6 +145,61 @@ Value 0.0 + AscentBuildPrefs_ActualRoot + + Comment + Center selection on parent prim's center. + Persist + 1 + Type + Boolean + Value + 1 + + AscentBuildPrefs_PivotIsPercent + + Comment + Would you like the chatbar to be able to be used for command line functions? + Persist + 1 + Type + Boolean + Value + 1 + + AscentBuildPrefs_PivotX + + Comment + idfk + Persist + 0 + Type + F32 + Value + 0.0 + + AscentBuildPrefs_PivotY + + Comment + idfk + Persist + 0 + Type + F32 + Value + 0.0 + + AscentBuildPrefs_PivotZ + + Comment + idfk + Persist + 0 + Type + F32 + Value + 0.0 + AscentCmdLine Comment diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp index 9dec6a55c..b46e9c564 100644 --- a/indra/newview/ascentprefssys.cpp +++ b/indra/newview/ascentprefssys.cpp @@ -64,9 +64,16 @@ private: void refreshValues(); //General ----------------------------------------------------------------------------- BOOL mDoubleClickTeleport; + BOOL mResetCameraAfterTP; + BOOL mOffsetTPByUserHeight; BOOL mPreviewAnimInWorld; BOOL mSaveScriptsAsMono; BOOL mAlwaysRezInGroup; + //Disable Teleport Progress + //Disable Logout progress + //always show Build + BOOL mAlwaysShowFly; + //Disable camera minimum distance //Chat/IM ----------------------------------------------------------------------------- BOOL mHideNotificationsInChat; BOOL mPlayTypingSound; @@ -99,6 +106,7 @@ LLPrefsAscentSysImpl::LLPrefsAscentSysImpl() LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml"); childSetCommitCallback("speed_rez_check", onCommitCheckBox, this); childSetCommitCallback("show_look_at_check", onCommitCheckBox, this); + refreshValues(); refresh(); } @@ -132,9 +140,16 @@ void LLPrefsAscentSysImpl::refreshValues() { //General ----------------------------------------------------------------------------- mDoubleClickTeleport = gSavedSettings.getBOOL("DoubleClickTeleport"); + mResetCameraAfterTP = gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP"); + mOffsetTPByUserHeight = gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight"); mPreviewAnimInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld"); mSaveScriptsAsMono = gSavedSettings.getBOOL("SaveScriptsAsMono"); mAlwaysRezInGroup = gSavedSettings.getBOOL("AscentAlwaysRezInGroup"); + //Disable Teleport Progress + //Disable Logout progress + //always show Build + mAlwaysShowFly = gSavedSettings.getBOOL("AscentFlyAlwaysEnabled"); + //Disable camera minimum distance //Chat/IMs ---------------------------------------------------------------------------- mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat"); mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification"); @@ -165,14 +180,19 @@ void LLPrefsAscentSysImpl::refreshValues() } void LLPrefsAscentSysImpl::refresh() -{ - refreshValues(); - +{ //General ----------------------------------------------------------------------------- childSetValue("double_click_teleport_check", mDoubleClickTeleport); + childSetValue("center_after_teleport_check", mResetCameraAfterTP); + childSetValue("offset_teleport_check", mOffsetTPByUserHeight); childSetValue("preview_anim_in_world_check", mPreviewAnimInWorld); childSetValue("save_scripts_as_mono_check", mSaveScriptsAsMono); childSetValue("always_rez_in_group_check", mAlwaysRezInGroup); + //Disable Teleport Progress + //Disable Logout progress + //always show Build + childSetValue("always_fly_check", mAlwaysShowFly); + //Disable camera minimum distance //Chat -------------------------------------------------------------------------------- childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat); childSetValue("play_typing_sound_check", mPlayTypingSound); @@ -251,6 +271,8 @@ void LLPrefsAscentSysImpl::cancel() { //General ----------------------------------------------------------------------------- childSetValue("double_click_teleport_check", mDoubleClickTeleport); + childSetValue("center_after_teleport_check", mResetCameraAfterTP); + childSetValue("offset_teleport_check", mOffsetTPByUserHeight); childSetValue("preview_anim_in_world_check", mPreviewAnimInWorld); childSetValue("save_scripts_as_mono_check", mSaveScriptsAsMono); childSetValue("always_rez_in_group_check", mAlwaysRezInGroup); @@ -301,11 +323,20 @@ void LLPrefsAscentSysImpl::apply() //General ------------------------------------------------------------------------------ gSavedSettings.setBOOL("DoubleClickTeleport", childGetValue("double_click_teleport_check")); + gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", childGetValue("center_after_teleport_check")); + gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", childGetValue("offset_teleport_check")); gSavedSettings.setBOOL("PreviewAnimInWorld", childGetValue("preview_anim_in_world_check")); gSavedSettings.setBOOL("SaveScriptsAsMono", childGetValue("save_scripts_as_mono_check")); gSavedSettings.setBOOL("AscentAlwaysRezInGroup", childGetValue("always_rez_in_group_check")); + //Disable Teleport Progress + //Disable Logout progress + //always show Build + gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", childGetValue("always_fly_check")); + //Disable camera minimum distance //Chat/IM ------------------------------------------------------------------------------ + //Use Vertical IMs + //Script count //Missing the echo/log option. gSavedSettings.setBOOL("PlayTypingSound", childGetValue("play_typing_sound_check")); gSavedSettings.setBOOL("AscentHideTypingNotification", childGetValue("hide_typing_check")); @@ -397,7 +428,7 @@ void LLPrefsAscentSysImpl::apply() gSavedSettings.setBOOL("PrivateLookAt", childGetValue("private_look_at_check")); LLHUDEffectLookAt::sDebugLookAt = childGetValue("show_look_at_check"); gSavedSettings.setBOOL("RevokePermsOnStandUp", childGetValue("revoke_perms_on_stand_up_check")); - + refreshValues(); } diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 5dfd927c0..07c99a37c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -793,7 +793,8 @@ BOOL LLAgent::canFly() if (isGodlike()) return TRUE; // - if(gSavedSettings.getBOOL("AlwaysAllowFly")) return TRUE; + if(gSavedSettings.getBOOL("AscentFlyAlwaysEnabled")) + return TRUE; // LLViewerRegion* regionp = getRegion(); diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index 5faa78a9e..73dc83c4a 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -137,10 +137,9 @@ LLOverlayBar::LLOverlayBar() bool updateAdvSettingsPopup(const LLSD &data) { - LLOverlayBar::sAdvSettingsPopup = gSavedSettings.getBOOL("wlfAdvSettingsPopup"); gOverlayBar->childSetVisible("AdvSettings_container", !LLOverlayBar::sAdvSettingsPopup); gOverlayBar->childSetVisible("AdvSettings_container_exp", LLOverlayBar::sAdvSettingsPopup); - return true; + return false; } bool updateChatVisible(const LLSD &data) 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 7d3b86482..be54e139f 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 @@ -2,7 +2,7 @@ + name="Ascent System" tab_min_width="70" tab_position="top">