diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-27 16:16:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-27 16:16:56 -0500 |
| commit | 380785e613b9823cb6160be5678e5f01783fee5f (patch) | |
| tree | dce0f35d02994c861428683b91f64371e9a64ea0 /indra/llcommon/llfasttimer.h | |
| parent | 21b78d7368f969fdf0daf7994fb565da633b1e71 (diff) | |
| parent | 4696eeeb30ce4d01c3bcbe74c9024f05d848968a (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
| -rwxr-xr-x | indra/llcommon/llfasttimer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 81c4b78775..a99a1d88af 100755 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -139,10 +139,11 @@ public: // used to statically declare a new named timer class LL_COMMON_API DeclareTimer - : public LLInstanceTracker<DeclareTimer> + : public LLInstanceTracker< DeclareTimer > { friend class LLFastTimer; public: + DeclareTimer(const std::string& name, bool open); DeclareTimer(const std::string& name); |