diff options
author | Richard Linden <none@none> | 2012-08-30 18:39:59 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-08-30 18:39:59 -0700 |
commit | c74d9f83a2a30ba364b983bc9e8abfd4099f6d68 (patch) | |
tree | 091bcef45d0f1f69437870a8c35626fdf4bf189f /indra/llcommon | |
parent | afc2807302f2a94b5cbb0fe86f304984ac7e50b8 (diff) | |
parent | 9e031934461c72fb97eecd4f074e1fe6d43fc1c0 (diff) |
Merge
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llfasttimer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index b3f7304664..e42e549df5 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -145,7 +145,6 @@ public: DeclareTimer(const std::string& name); NamedTimer& getNamedTimer() { return mTimer; } - const NamedTimer& getNamedTimer() const { return mTimer; } private: FrameState mFrameState; |