diff options
author | Dave Parks <davep@lindenlab.com> | 2010-07-15 14:17:51 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-07-15 14:17:51 -0500 |
commit | 93ea3d2850067c23ff07f0ffb362b73247840e9a (patch) | |
tree | 05b1bd136b33f1f9b2d70ce2d199f5c61d587991 /indra/newview/llappviewer.cpp | |
parent | 13202e744c35f0c6154cd0b582b1834896cacb79 (diff) |
Merge cleanup.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 0ef403720b..8ffdd30d04 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3515,8 +3515,6 @@ static LLFastTimer::DeclareTimer FTM_REGION_UPDATE("Update Region"); static LLFastTimer::DeclareTimer FTM_WORLD_UPDATE("Update World"); static LLFastTimer::DeclareTimer FTM_NETWORK("Network"); static LLFastTimer::DeclareTimer FTM_AGENT_NETWORK("Agent Network"); -static LLFastTimer::DeclareTimer FTM_AGENT_AUTOPILOT("Autopilot"); -static LLFastTimer::DeclareTimer FTM_AGENT_UPDATE("Update"); static LLFastTimer::DeclareTimer FTM_VLMANAGER("VL Manager"); /////////////////////////////////////////////////////// |