Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

idfk

Browse Source
This commit is contained in:
CharleyLevenque
2010-09-01 21:33:49 -04:00
parent 3e226eae0c 9c207ae7e1
commit 95327d1bda
4 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/app_settings/settings.xml
View File

@@ -34,17 +34,6 @@
<string>F32</string> <string>F32</string>
<key>Value</key> <key>Value</key>
<real>0.0</real> <real>0.0</real>
</map>
<key>Ascentnumscripts</key>
<map>
<key>Comment</key>
<string>temp..</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map> </map>
<key>AscentBuildAlwaysEnabled</key> <key>AscentBuildAlwaysEnabled</key>
<map> <map>
@@ -101,8 +90,8 @@
<key>Value</key> <key>Value</key>
<real>100</real> <real>100</real>
</map> </map>
<key>Ascentnumscripts</key> <key>Ascentnumscripts</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>temp..</string> <string>temp..</string>
<key>Persist</key> <key>Persist</key>
@@ -111,7 +100,7 @@
<string>F32</string> <string>F32</string>
<key>Value</key> <key>Value</key>
<real>0.0</real> <real>0.0</real>
</map> </map>
<key>AscentBuildPrefs_ActualRoot</key> <key>AscentBuildPrefs_ActualRoot</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
@@ -139,33 +128,33 @@
<key>Comment</key> <key>Comment</key>
<string>idfk</string> <string>idfk</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>F32</string> <string>F32</string>
<key>Value</key> <key>Value</key>
<real>0.0</real> <real>50</real>
</map> </map>
<key>AscentBuildPrefs_PivotY</key> <key>AscentBuildPrefs_PivotY</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>idfk</string> <string>idfk</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>F32</string> <string>F32</string>
<key>Value</key> <key>Value</key>
<real>0.0</real> <real>50</real>
</map> </map>
<key>AscentBuildPrefs_PivotZ</key> <key>AscentBuildPrefs_PivotZ</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>idfk</string> <string>idfk</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>F32</string> <string>F32</string>
<key>Value</key> <key>Value</key>
<real>0.0</real> <real>50</real>
</map> </map>
<key>AscentCmdLine</key> <key>AscentCmdLine</key>
<map> <map>

7
indra/newview/llagent.cpp
View File

@@ -889,6 +889,13 @@ void LLAgent::togglePhantom()
setPhantom( phan ); setPhantom( phan );
} }
void LLAgent::toggleTPosed()
{
BOOL posed = !(mForceTPose);
setTPosed(posed);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// setRegion() // setRegion()

6
indra/newview/llagent.h
View File

@@ -414,6 +414,10 @@ public:
static void setPhantom(BOOL phantom); static void setPhantom(BOOL phantom);
static void togglePhantom(); 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? // Does this parcel allow you to fly?
BOOL canFly(); BOOL canFly();
@@ -816,7 +820,7 @@ public:
private: private:
static BOOL exlPhantom; static BOOL exlPhantom;
static BOOL mForceTPose;
bool mbTeleportKeepsLookAt; // try to keep look-at after teleport is complete bool mbTeleportKeepsLookAt; // try to keep look-at after teleport is complete
bool mbAlwaysRun; // should the avatar run by default rather than walk bool mbAlwaysRun; // should the avatar run by default rather than walk
bool mbRunning; // is the avatar trying to run right now bool mbRunning; // is the avatar trying to run right now

51
indra/newview/llviewermenu.cpp
View File

@@ -3440,53 +3440,50 @@ void handle_close_all_notifications(void*)
// The following animations were made by Charley Levenque and are // The following animations were made by Charley Levenque and are
// not public property or free to use via UUID. When replicating // not public property or free to use via UUID. When replicating
// this code, please supply your own animations. // this code, please supply your own animations.
void set_current_pose(std::string anim)
{
if (current_pose == LLUUID::null)
gSavedSettings.setF32("AscentAvatarZModifier", gSavedSettings.getF32("AscentAvatarZModifier") + 7.5);
gAgent.sendAgentSetAppearance();
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose.set(anim);
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
}
void handle_pose_stand_ltao(void*) void handle_pose_stand_ltao(void*)
{ {
gSavedSettings.setF32("AscentAvatarZModifier", 5.0); set_current_pose("6c082c7b-f70e-9da0-0451-54793f869ff4");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose.set("6c082c7b-f70e-9da0-0451-54793f869ff4");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
} }
void handle_pose_stand_ltah(void*) void handle_pose_stand_ltah(void*)
{ {
gSavedSettings.setF32("AscentAvatarZModifier", 5.0); set_current_pose("45e59c14-913b-c58c-2a55-c0a5c1eeef53");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose.set("45e59c14-913b-c58c-2a55-c0a5c1eeef53");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
} }
void handle_pose_stand_ltad(void*) void handle_pose_stand_ltad(void*)
{ {
gSavedSettings.setF32("AscentAvatarZModifier", 5.0); set_current_pose("421d6bb4-94a9-3c42-4593-f2bc1f6a26e6");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose.set("421d6bb4-94a9-3c42-4593-f2bc1f6a26e6");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
} }
void handle_pose_stand_loau(void*) void handle_pose_stand_loau(void*)
{ {
gSavedSettings.setF32("AscentAvatarZModifier", 5.0); set_current_pose("8b3bb239-d610-1c0f-4d1a-69d29bc17e2c");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose.set("8b3bb239-d610-1c0f-4d1a-69d29bc17e2c");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
} }
void handle_pose_stand_loao(void*) void handle_pose_stand_loao(void*)
{ {
gSavedSettings.setF32("AscentAvatarZModifier", 5.0); set_current_pose("4d70e328-48b6-dc6a-0be1-85dd6b333e81");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose.set("4d70e328-48b6-dc6a-0be1-85dd6b333e81");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
} }
void handle_pose_stand_lhao(void*) void handle_pose_stand_lhao(void*)
{ {
gSavedSettings.setF32("AscentAvatarZModifier", 5.0); set_current_pose("f088eaf0-f1c9-8cf1-99c8-09df96bb13ae");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose.set("f088eaf0-f1c9-8cf1-99c8-09df96bb13ae");
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START);
} }
void handle_pose_stand_stop(void*) void handle_pose_stand_stop(void*)
{ {
gSavedSettings.setF32("AscentAvatarZModifier", 0.0); if (current_pose != LLUUID::null)
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP); {
current_pose = LLUUID::null; gSavedSettings.setF32("AscentAvatarZModifier", gSavedSettings.getF32("AscentAvatarZModifier") - 7.5);
gAgent.sendAgentSetAppearance();
gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP);
current_pose = LLUUID::null;
}
} }
// </dogmode> --------------------------------------------------- // </dogmode> ---------------------------------------------------