diff options
author | James Cook <james@lindenlab.com> | 2009-12-18 12:32:01 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-18 12:32:01 -0800 |
commit | efdfc74b21f5d6386cc03136c4d2a8dcf07f9958 (patch) | |
tree | 620d86df1d2b2cc409109eace7888cb68e1dc921 /indra/newview/llviewermedia.h | |
parent | eb501f3231aacb2fd97d8428bb2d25b818b26263 (diff) | |
parent | c1b58587dfe4711383b1878d341527221d2c298f (diff) |
Merge with viewer-2-0 again, to pick up avatar changes
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 7151186089..28fb379960 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -188,6 +188,7 @@ public: std::string getCurrentMediaURL(); std::string getHomeURL() { return mHomeURL; } void setHomeURL(const std::string& home_url) { mHomeURL = home_url; }; + void clearCache(); std::string getMimeType() { return mMimeType; } void scaleMouse(S32 *mouse_x, S32 *mouse_y); void scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y); @@ -355,6 +356,7 @@ public: bool mMediaAutoPlay; std::string mMediaEntryURL; bool mInNearbyMediaList; // used by LLFloaterNearbyMedia::refreshList() for performance reasons + bool mClearCache; private: BOOL mIsUpdated ; |