summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstats.h
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-03-20 12:15:27 -0400
committerNyx Linden <nyx@lindenlab.com>2013-03-20 12:15:27 -0400
commit33954bbbe5517a0ad72ffc6bad7cb94985b3bf8b (patch)
treebfc3b031000007362e22bc8d2c3881f34489d0f9 /indra/newview/llviewerassetstats.h
parent626cb6319945f6ff8feee2aec862924581a66056 (diff)
parent779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff)
merging in changes from sunshine-stable
Diffstat (limited to 'indra/newview/llviewerassetstats.h')
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewerassetstats.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llviewerassetstats.h b/indra/newview/llviewerassetstats.h
index 8319752230..e4581d2120 100644..100755
--- a/indra/newview/llviewerassetstats.h
+++ b/indra/newview/llviewerassetstats.h
@@ -256,10 +256,6 @@ protected:
// Time of last reset
duration_t mResetTimestamp;
-
- // Nearby avatar stats
- std::vector<S32> mAvatarRezStates;
- LLViewerStats::phase_stats_t mPhaseStats;
};
@@ -318,8 +314,6 @@ void record_response_main(LLViewerAssetType::EType at, bool with_http, bool is_t
void record_fps_main(F32 fps);
-void record_avatar_stats();
-
/**
* Region context, event and duration loggers for Thread 1.
*/