diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-03-29 17:53:21 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-03-29 17:53:21 +0100 |
| commit | eb0aaff4aac1dcf9f238242c107df650584efdf9 (patch) | |
| tree | b07b612c33f23e820492b06488a8c406856b64c8 /indra/newview/llappviewer.cpp | |
| parent | fc0906d6e8c1238fe7fd21c185957ca89511e76e (diff) | |
| parent | b6e7850c0a3d65ed0a1501e19a1655055000e32f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a3d0b8d8d9..a8d69a38cd 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -79,6 +79,7 @@ #include "lllocationhistory.h" #include "llfasttimerview.h" #include "llvoicechannel.h" +#include "llvoavatarself.h" #include "llsidetray.h" @@ -356,7 +357,7 @@ void request_initial_instant_messages() if (!requested && gMessageSystem && LLMuteList::getInstance()->isLoaded() - && gAgent.getAvatarObject()) + && isAgentAvatarValid()) { // Auto-accepted inventory items may require the avatar object // to build a correct name. Likewise, inventory offers from @@ -3619,7 +3620,7 @@ void LLAppViewer::idle() // Handle pending gesture processing static LLFastTimer::DeclareTimer ftm("Agent Position"); LLFastTimer t(ftm); - LLGestureManager::instance().update(); + LLGestureMgr::instance().update(); gAgent.updateAgentPosition(gFrameDTClamped, yaw, current_mouse.mX, current_mouse.mY); } |