diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
| commit | d82da834fa4026f2912406e9d39196ec7287f785 (patch) | |
| tree | 173094ca3fc90abbea3686d274c8a2dcb7adabd6 /indra/newview/llviewerobject.cpp | |
| parent | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (diff) | |
| parent | 939e8d8f74687e7cb857c55bb6a8082226f1202b (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 27f371df9c..f380d4b183 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -241,13 +241,12 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe mState(0), mMedia(NULL), mClickAction(0), - mObjectCost(0.f), - mLinksetCost(0.f), - mPhysicsCost(0.f), mLinksetPhysicsCost(0.f), mCostStale(true), mPhysicsShapeUnknown(true), - mAttachmentItemID(LLUUID::null) + mAttachmentItemID(LLUUID::null), + mLastUpdateType(OUT_UNKNOWN), + mLastUpdateCached(FALSE) { if (!is_global) { @@ -5617,6 +5616,15 @@ const LLUUID &LLViewerObject::extractAttachmentItemID() return getAttachmentItemID(); } +EObjectUpdateType LLViewerObject::getLastUpdateType() const +{ + return mLastUpdateType; +} + +void LLViewerObject::setLastUpdateType(EObjectUpdateType last_update_type) +{ + mLastUpdateType = last_update_type; +} //virtual LLVOAvatar* LLViewerObject::getAvatar() const |