summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-26 14:33:48 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-26 14:33:48 -0400
commit46fe5d49caef6c8db3df9d88f0d0ec773ef28095 (patch)
tree87f8ae2f01d871b23b9d1c1ef9f9ce736dbc8c98 /indra/newview/llgesturemgr.cpp
parent0bcfbde3a4265d7963ea501622e512de8eab7f61 (diff)
EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
-rw-r--r--indra/newview/llgesturemgr.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 0ba7bdf613..47a9961323 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -746,8 +746,8 @@ void LLGestureManager::stepGesture(LLMultiGesture* gesture)
{
return;
}
- LLVOAvatar* avatar = gAgent.getAvatarObject();
- if (!avatar) return;
+ LLVOAvatarSelf* avatarp = gAgent.getAvatarObject();
+ if (!avatarp) return;
// Of the ones that started playing, have any stopped?
@@ -758,8 +758,8 @@ void LLGestureManager::stepGesture(LLMultiGesture* gesture)
{
// look in signaled animations (simulator's view of what is
// currently playing.
- LLVOAvatar::AnimIterator play_it = avatar->mSignaledAnimations.find(*gest_it);
- if (play_it != avatar->mSignaledAnimations.end())
+ LLVOAvatar::AnimIterator play_it = avatarp->mSignaledAnimations.find(*gest_it);
+ if (play_it != avatarp->mSignaledAnimations.end())
{
++gest_it;
}
@@ -777,8 +777,8 @@ void LLGestureManager::stepGesture(LLMultiGesture* gesture)
gest_it != gesture->mRequestedAnimIDs.end();
)
{
- LLVOAvatar::AnimIterator play_it = avatar->mSignaledAnimations.find(*gest_it);
- if (play_it != avatar->mSignaledAnimations.end())
+ LLVOAvatar::AnimIterator play_it = avatarp->mSignaledAnimations.find(*gest_it);
+ if (play_it != avatarp->mSignaledAnimations.end())
{
// Hooray, this animation has started playing!
// Copy into playing.