diff options
author | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
commit | f2a1f0df3a3c8ce18179ea06992f5e5d07f2f773 (patch) | |
tree | cd571814ec2e9d11ef05f8107e068ca6702df2a6 /indra/newview/llviewerobject.h | |
parent | 4a083db6c52d2cc5c1cd1f908270f5952ace6505 (diff) | |
parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) |
Merge from viewer-development
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r-- | indra/newview/llviewerobject.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 614a5e59fa..7afb7f464b 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -613,7 +613,6 @@ protected: F64 mLastInterpUpdateSecs; // Last update for purposes of interpolation F64 mLastMessageUpdateSecs; // Last update from a message from the simulator TPACKETID mLatestRecvPacketID; // Latest time stamp on message from simulator - U32 mCircuitPacketCount; // Packet tracking for early detection of a stopped simulator circuit // extra data sent from the sim...currently only used for tree species info U8* mData; |