diff options
author | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
---|---|---|
committer | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
commit | c4c8e13ac5f555a5b9257582bcc8c3494be1de5d (patch) | |
tree | 897327da900fb002065b1e2f01f213333115d556 /indra/newview/llgesturemgr.cpp | |
parent | dbd619508ba45292c2cebe096494c28e74941643 (diff) | |
parent | 017da5453e92170ba37e93f364f30a9ccfbff202 (diff) |
merge
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
-rw-r--r-- | indra/newview/llgesturemgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 2f9856c650..66ca76bfb0 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -53,6 +53,7 @@ #include "llviewerstats.h" #include "llnearbychatbar.h" #include "llappearancemgr.h" +#include "llgesturelistener.h" // Longest time, in seconds, to wait for all animations to stop playing const F32 MAX_WAIT_ANIM_SECS = 30.f; @@ -70,6 +71,7 @@ LLGestureMgr::LLGestureMgr() mLoadingCount(0) { gInventory.addObserver(this); + mListener.reset(new LLGestureListener()); } |