summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-06 21:38:05 -0500
committerOz Linden <oz@lindenlab.com>2011-01-06 21:38:05 -0500
commit09c01c4e925833873a83665fe0642637b65e547e (patch)
tree2e3478234c046ad76cc7b1558a8d30fffaffdb25 /indra/newview/llagent.h
parent3f6fe6912a28fbf0b2fcff1f8c959c4cb83a07b8 (diff)
parent9833f436641c5aa545decd1a75ae7704d34cc32f (diff)
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r--indra/newview/llagent.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index aebebad96a..896408c0dd 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -39,6 +39,8 @@
#include "llvoavatardefines.h"
#include "llslurl.h"
+#include <boost/signals2.hpp>
+
extern const BOOL ANIMATE;
extern const U8 AGENT_STATE_TYPING; // Typing indication
extern const U8 AGENT_STATE_EDITING; // Set when agent has objects selected
@@ -410,7 +412,13 @@ public:
BOOL getCustomAnim() const { return mCustomAnim; }
void setCustomAnim(BOOL anim) { mCustomAnim = anim; }
+ typedef boost::signals2::signal<void ()> camera_signal_t;
+ boost::signals2::connection setMouselookModeInCallback( const camera_signal_t::slot_type& cb );
+ boost::signals2::connection setMouselookModeOutCallback( const camera_signal_t::slot_type& cb );
+
private:
+ camera_signal_t* mMouselookModeInSignal;
+ camera_signal_t* mMouselookModeOutSignal;
BOOL mCustomAnim; // Current animation is ANIM_AGENT_CUSTOMIZE ?
LLAnimPauseRequest mPauseRequest;
BOOL mViewsPushed; // Keep track of whether or not we have pushed views