diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-24 10:56:40 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-24 10:56:40 -0500 |
| commit | d0cba9e9194841e8867afcbd02b3792b652756ab (patch) | |
| tree | 3a1016da682349dcab75b826c6a9ed002a80a6b2 /indra/newview/llviewerobject.h | |
| parent | 4fefb98cba6cdf5051bfd4d575dcccc468d77836 (diff) | |
| parent | 7a453b7c9351a743b222bbb2b94809cf7c6b3ce8 (diff) | |
Automated merge up from viewer-development into mesh-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 8883272cde..2b2b7bd59d 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -656,7 +656,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; |