diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/lltoolcomp.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolcomp.h')
| -rw-r--r-- | indra/newview/lltoolcomp.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h index 5dacfbb7cf..d6ec6032cd 100644 --- a/indra/newview/lltoolcomp.h +++ b/indra/newview/lltoolcomp.h @@ -104,7 +104,7 @@ public: //----------------------------------------------------------------------- // LLToolCompTranslate -class LLToolCompInspect : public LLToolComposite +class LLToolCompInspect : public LLToolComposite, public LLSingleton<LLToolCompInspect> { public: LLToolCompInspect(); @@ -120,7 +120,7 @@ public: //----------------------------------------------------------------------- // LLToolCompTranslate -class LLToolCompTranslate : public LLToolComposite +class LLToolCompTranslate : public LLToolComposite, public LLSingleton<LLToolCompTranslate> { public: LLToolCompTranslate(); @@ -141,7 +141,7 @@ public: //----------------------------------------------------------------------- // LLToolCompScale -class LLToolCompScale : public LLToolComposite +class LLToolCompScale : public LLToolComposite, public LLSingleton<LLToolCompScale> { public: LLToolCompScale(); @@ -163,7 +163,7 @@ public: //----------------------------------------------------------------------- // LLToolCompRotate -class LLToolCompRotate : public LLToolComposite +class LLToolCompRotate : public LLToolComposite, public LLSingleton<LLToolCompRotate> { public: LLToolCompRotate(); @@ -186,7 +186,7 @@ protected: //----------------------------------------------------------------------- // LLToolCompCreate -class LLToolCompCreate : public LLToolComposite +class LLToolCompCreate : public LLToolComposite, public LLSingleton<LLToolCompCreate> { public: LLToolCompCreate(); @@ -211,7 +211,7 @@ class LLToolGun; class LLToolGrab; class LLToolSelect; -class LLToolCompGun : public LLToolComposite +class LLToolCompGun : public LLToolComposite, public LLSingleton<LLToolCompGun> { public: LLToolCompGun(); @@ -234,11 +234,5 @@ protected: LLTool* mNull; }; -extern LLToolCompInspect *gToolInspect; -extern LLToolCompTranslate *gToolTranslate; -extern LLToolCompScale *gToolStretch; -extern LLToolCompRotate *gToolRotate; -extern LLToolCompCreate *gToolCreate; -extern LLToolCompGun *gToolGun; #endif // LL_TOOLCOMP_H |