diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
| commit | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (patch) | |
| tree | adeadd5ef0b8c4514b325f74c3426b2af76e422b /indra/llcommon/llfasttimer.h | |
| parent | f53b2bd880875b5194b6d298e1aad7d8951db9f3 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Pull merge of lindenlab/viewer-release
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); |