From cf9239cabcf7999a2d2393bd4bdb6fc08e27c09c Mon Sep 17 00:00:00 2001
From: Monroe Williams <monroe@lindenlab.com>
Date: Thu, 1 Oct 2009 02:35:53 +0000
Subject: svn merge -r 134922:134973
 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7

Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
---
 indra/llplugin/llpluginprocesschild.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llplugin/llpluginprocesschild.h')

diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h
index f92905e8bd..75860bdf0a 100644
--- a/indra/llplugin/llpluginprocesschild.h
+++ b/indra/llplugin/llpluginprocesschild.h
@@ -102,6 +102,7 @@ private:
 	
 	LLTimer mHeartbeat;
 	F64		mSleepTime;
+	F64		mCPUElapsed;
 	
 };
 
-- 
cgit v1.2.3