diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-21 16:26:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-21 16:26:35 -0700 |
| commit | 130e6e895b1707445b8d297dadad13e678848dd6 (patch) | |
| tree | c0579d72cd8d979bc5810b1dec515bc96da74fe5 /indra/newview/llviewerobject.h | |
| parent | 4af7e9eb64097c9fdcef86758fc42932d3ccd477 (diff) | |
| parent | 790dfe7556a476b502ef3a0ea921efdd11735f28 (diff) | |
Merge
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; |