diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-11 12:57:42 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-11 12:57:42 +0200 |
commit | 9393c28831c3b51d9b84950bb0bc89ca50edac23 (patch) | |
tree | 46f3aeb3d340d115c6ccd4a53993350b47691f96 /indra/newview/llviewerparcelmediaautoplay.h | |
parent | 1a21ce62c225dfc8f2671691929a3b1a9bc73726 (diff) | |
parent | df08485cf840e21e2ec8d14664a45714e0a3ca96 (diff) |
Merge from default branch.
--HG--
branch : product-engine
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; }; |