diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:36:49 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:36:49 +0000 |
| commit | a1dcf7a384fa452c1e56064168c126c0e1a8e71f (patch) | |
| tree | 6473ef88b9c5793d366e7df1dd582814ae55f68a /indra/newview | |
| parent | 5777dfaae6268dffee83d7a457c024b1a89f81ff (diff) | |
| parent | 4a943e234d86553b3d7d7c932ce91d1209c8e54e (diff) | |
merge.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ae31c9732c..e27f67943a 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3274,6 +3274,9 @@ const F32 MAX_HEAD_ROT_QDOT = 0.99999f; // ~= 0.5 degrees -- if its greater th void send_agent_update(BOOL force_send, BOOL send_reliable) { + bool is_flying = gAgent.getFlying(); + llinfos << "agent flying = " << int(is_flying) << llendl; + if (gAgent.getTeleportState() != LLAgent::TELEPORT_NONE) { // We don't care if they want to send an agent update, they're not allowed to until the simulator @@ -4035,6 +4038,43 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) gAgent.setFlying(FALSE); } + if (animation_id == ANIM_AGENT_STANDUP) + { + llwarns << "ANIM_AGENT_STANDUP" << llendl; + } + if (animation_id == ANIM_AGENT_SIT) + { + llwarns << "ANIM_AGENT_SIT" << llendl; + } + if (animation_id == ANIM_AGENT_STAND) + { + llwarns << "ANIM_AGENT_STAND" << llendl; + } + if (animation_id == ANIM_AGENT_HOVER) + { + llwarns << "ANIM_AGENT_HOVER" << llendl; + } + if (animation_id == ANIM_AGENT_SIT_TO_STAND) + { + llwarns << "ANIM_AGENT_SIT_TO_STAND" << llendl; + } + if (animation_id == ANIM_AGENT_SIT_FEMALE) + { + llwarns << "ANIM_AGENT_SIT_FEMALE" << llendl; + } + if (animation_id == ANIM_AGENT_SIT_GENERIC) + { + llwarns << "ANIM_AGENT_SIT_GENERIC" << llendl; + } + if (animation_id == ANIM_AGENT_SIT_GROUND) + { + llwarns << "ANIM_AGENT_SIT_GROUND" << llendl; + } + if (animation_id == ANIM_AGENT_SIT_GROUND_CONSTRAINED) + { + llwarns << "ANIM_AGENT_SIT_GROUND_CONSTRAINED" << llendl; + } + if (i < num_source_blocks) { mesgsys->getUUIDFast(_PREHASH_AnimationSourceList, _PREHASH_ObjectID, object_id, i); |