diff options
| author | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-02-28 22:56:30 +0000 |
|---|---|---|
| committer | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-02-28 22:56:30 +0000 |
| commit | 3a3da6e4a76859f32dc36491fde2992e92ae57b5 (patch) | |
| tree | f61a7417ad6ffcb8488c910cfa64f14afe979071 /indra/newview/llgesturemgr.h | |
| parent | 069c938eb6ebfd77f6a415207331c66f72270e5f (diff) | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
merge
Diffstat (limited to 'indra/newview/llgesturemgr.h')
| -rw-r--r-- | indra/newview/llgesturemgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h index 26a5924ec3..402bdf6039 100644 --- a/indra/newview/llgesturemgr.h +++ b/indra/newview/llgesturemgr.h @@ -51,6 +51,8 @@ public: class LLGestureMgr : public LLSingleton<LLGestureMgr>, public LLInventoryFetchItemsObserver { + LLSINGLETON(LLGestureMgr); + ~LLGestureMgr(); public: typedef boost::function<void (LLMultiGesture* loaded_gesture)> gesture_loaded_callback_t; @@ -58,8 +60,6 @@ public: typedef std::map<LLUUID, LLMultiGesture*> item_map_t; typedef std::map<LLUUID, gesture_loaded_callback_t> callback_map_t; - LLGestureMgr(); - ~LLGestureMgr(); void init(); |