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

Fixes for Idle system. Should be good now.

Browse Source 
Jerked-off-by: CharleyLevenque <charley.levenque@gmail.com>
This commit is contained in:
CharleyLevenque
2010-08-25 00:51:10 -04:00
parent bd689b1dd2
commit a901796893
2 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewermessage.cpp
View File

@@ -2405,20 +2405,17 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
msg->getUUID("ChatData", "SourceID", from_id);
chat.mFromID = from_id;
// <edit>
// this chatter assignment is moved from below
chatter = gObjectList.findObject(from_id);
/*
if(chatter)
{
if(chatter->isAvatar())
{
((LLVOAvatar*)chatter)->resetIdleTime();
((LLVOAvatar*)chatter)->mIdleTimer.reset();
}
}
*/
// </edit>
// Object owner for objects
msg->getUUID("ChatData", "OwnerID", owner_id);
msg->getU8Fast(_PREHASH_ChatData, _PREHASH_SourceType, source_temp);

64
indra/newview/llvoavatar.cpp
View File

@@ -5827,39 +5827,39 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
gAgent.setAFK();
}
if( id == ANIM_AGENT_BUSY ||
id == ANIM_AGENT_CROUCH ||
id == ANIM_AGENT_CROUCHWALK ||
id == ANIM_AGENT_FEMALE_WALK ||
id == ANIM_AGENT_FLY ||
id == ANIM_AGENT_FLYSLOW ||
id == ANIM_AGENT_HOVER ||
id == ANIM_AGENT_HOVER_DOWN ||
id == ANIM_AGENT_HOVER_UP ||
id == ANIM_AGENT_JUMP ||
id == ANIM_AGENT_LAND ||
id == ANIM_AGENT_PRE_JUMP ||
id == ANIM_AGENT_RUN ||
id == ANIM_AGENT_SHOUT ||
id == ANIM_AGENT_SIT ||
id == ANIM_AGENT_SIT_FEMALE ||
id == ANIM_AGENT_SIT_GENERIC ||
id == ANIM_AGENT_SIT_GROUND ||
id == ANIM_AGENT_SIT_GROUND_CONSTRAINED ||
id == ANIM_AGENT_SNAPSHOT ||
id == ANIM_AGENT_STAND ||
id == ANIM_AGENT_TURNLEFT ||
id == ANIM_AGENT_TURNRIGHT ||
id == ANIM_AGENT_TYPE ||
id == ANIM_AGENT_WALK ||
id == ANIM_AGENT_WHISPER ||
id == ANIM_AGENT_WHISPER
)
mIdleTimer.reset();
return LLCharacter::startMotion(id, time_offset);
}
//-----------------------------------------------------------------------------
// stopMotion()
//-----------------------------------------------------------------------------
@@ -5889,6 +5889,10 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
{
LLCharacter::stopMotion(ANIM_AGENT_SIT_FEMALE, stop_immediate);
}
if(id == ANIM_AGENT_AWAY ||
id == ANIM_AGENT_BUSY)
mIdleTimer.reset();
return LLCharacter::stopMotion(id, stop_immediate);
}