diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 11:52:44 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 11:52:44 -0500 |
| commit | 871e64726a147623f52776993ddced97bbf0e065 (patch) | |
| tree | d8941e09de552e354ad8b04a77f5f77fb71a4a6d /indra/newview/llvovolume.h | |
| parent | 045e3e06579d533619208fb415399e68714244e3 (diff) | |
| parent | f125039abcb566eaa7bdf33ce9c8c550cc25783a (diff) | |
automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index fe4b5488fa..7433404942 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -238,7 +238,7 @@ public: // Update this object's media data with the given media data array // (typically this is only called upon a response from a server request) - void updateObjectMediaData(const LLSD &media_data_array); + void updateObjectMediaData(const LLSD &media_data_array, const std::string &media_version); // Bounce back media at the given index to its current URL (or home URL, if current URL is empty) void mediaNavigateBounceBack(U8 texture_index); @@ -270,13 +270,16 @@ public: // Returns 'true' iff the media data for this object is in flight bool isMediaDataBeingFetched() const; + // Returns the "last fetched" media version, or -1 if not fetched yet + S32 getLastFetchedMediaVersion() const { return mLastFetchedMediaVersion; } + protected: S32 computeLODDetail(F32 distance, F32 radius); BOOL calcLOD(); LLFace* addFace(S32 face_index); void updateTEData(); - void requestMediaDataUpdate(); + void requestMediaDataUpdate(bool isNew); void cleanUpMediaImpls(); void addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index) ; void removeMediaImpl(S32 texture_index) ; @@ -300,6 +303,7 @@ private: LLPointer<LLViewerFetchedTexture> mSculptTexture; LLPointer<LLViewerFetchedTexture> mLightTexture; media_list_t mMediaImplList; + S32 mLastFetchedMediaVersion; // as fetched from the server, starts as -1 // statics public: |