summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-03 11:37:41 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-03 11:37:41 +0000
commitf7ecfe6dc453bf06c24934b58f67637790fe3c44 (patch)
tree063583a1f9f7441356814be5891e6a7bcc61b9d4
parenta1dcf7a384fa452c1e56064168c126c0e1a8e71f (diff)
parent8821755bd4fb010573c0f43e8ea2daf527d45e79 (diff)
merge.
-rw-r--r--indra/newview/llviewermessage.cpp40
1 files changed, 0 insertions, 40 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e27f67943a..ae31c9732c 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3274,9 +3274,6 @@ 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
@@ -4038,43 +4035,6 @@ 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);