From 8bf941ca3829714f43e44abce4b7fdc0064c8746 Mon Sep 17 00:00:00 2001 From: Beeks Date: Wed, 1 Sep 2010 18:12:48 -0400 Subject: [PATCH 1/2] e.e --- indra/newview/app_settings/settings.xml | 147 +++++++++--------------- indra/newview/llagent.cpp | 7 ++ indra/newview/llagent.h | 6 +- 3 files changed, 69 insertions(+), 91 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f9524946b..3b25f4731 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2,104 +2,71 @@ - AscentDisplayTotalScriptJumps - - Comment - Shows large changes to the sim script count in chat. - Persist - 1 - Type - Boolean - Value - 1 - - Ascentnumscriptdiff - - Comment - The delta to spam you the script jump difference - Persist - 1 - Type - F32 - 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 - temp.. - Persist - 0 - Type - F32 - Value - 0.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 + + + Avatar position modifier (Z) + Persist + 1 + Type + F32 + Value + 0.0 + AscentBuildAlwaysEnabled - Comment - Show build option regardless of whether you can (May not mean you can actually build there) - Persist - 1 - Type - Boolean - Value - 1 + Comment + Show build option regardless of whether you can (May not mean you can actually build there) + Persist + 1 + Type + Boolean + Value + 1 AscentDisableMinZoomDist - Comment - Allows much closer camera zooming. - Persist - 1 - Type - Boolean - Value - 1 + Comment + Allows much closer camera zooming. + Persist + 1 + Type + Boolean + Value + 1 AscentFlyAlwaysEnabled - Comment - Always allow fly (Does actually always allow flight) - Persist - 1 - Type - Boolean - Value - 0 + Comment + Always allow fly (Does actually always allow flight) + Persist + 1 + Type + Boolean + Value + 0 AscentDisableMinZoomDist diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index aed6d73ee..2d34dd83f 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -889,6 +889,13 @@ void LLAgent::togglePhantom() setPhantom( phan ); } +void LLAgent::toggleTPosed() +{ + BOOL posed = !(mForceTPose); + + setTPosed(posed); +} + //----------------------------------------------------------------------------- // setRegion() diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 18f1cbd38..10e9f1a2c 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -414,6 +414,10 @@ public: static void setPhantom(BOOL phantom); static void togglePhantom(); + static BOOL isTPosed() { return mForceTPose; }; + static void setTPosed(BOOL TPose) { mForceTPose = TPose }; + static void toggleTPosed(); + // Does this parcel allow you to fly? BOOL canFly(); @@ -816,7 +820,7 @@ public: private: static BOOL exlPhantom; - + static BOOL mForceTPose; bool mbTeleportKeepsLookAt; // try to keep look-at after teleport is complete bool mbAlwaysRun; // should the avatar run by default rather than walk bool mbRunning; // is the avatar trying to run right now From 9c207ae7e1be25fcc037a05d6fd7f93810aeb350 Mon Sep 17 00:00:00 2001 From: Beeks Date: Wed, 1 Sep 2010 18:16:18 -0400 Subject: [PATCH 2/2] settings file is getting fucked up. --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3b25f4731..10938d9cc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -68,17 +68,6 @@ Value 0 - AscentDisableMinZoomDist - - Comment - Disable minimum zoom distance for the camera. - Persist - 1 - Type - Boolean - Value - 1 - AscentDisplayTotalScriptJumps Comment