diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
| commit | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (patch) | |
| tree | a485d28fd9861c41bf9b7117c085bd84617f43de /indra/llcommon/llfasttimer.h | |
| parent | dd4beb695a9c800b37b7c9a19d3ac3f4456012f5 (diff) | |
| parent | badb8a945d31aed6f396e7efb521e76083870069 (diff) | |
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
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); |