diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
commit | 1a35fe8725d4a55ef1e1b07d59db8e8d0db5e6bf (patch) | |
tree | 04895ab55cf6ab33f1412131c76a71f4f4d549d4 /indra/newview/llviewerparcelmediaautoplay.h | |
parent | 8440d99e4498882dfc61459a91eba746ad717000 (diff) | |
parent | 2aaa7971945823f53f0a01028036c37361bcfa17 (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.h')
-rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h index 16279e7f1f..1d80b4756c 100644 --- a/indra/newview/llviewerparcelmediaautoplay.h +++ b/indra/newview/llviewerparcelmediaautoplay.h @@ -34,6 +34,7 @@ #define LLVIEWERPARCELMEDIAAUTOPLAY_H #include "lltimer.h" +#include "lluuid.h" // timer to automatically play media class LLViewerParcelMediaAutoPlay : LLEventTimer @@ -47,6 +48,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer private: S32 mLastParcelID; + LLUUID mLastRegionID; BOOL mPlayed; F32 mTimeInParcel; }; |