diff options
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp index 6e0db94985..41bc5c8cfa 100644 --- a/indra/newview/llviewerparcelmediaautoplay.cpp +++ b/indra/newview/llviewerparcelmediaautoplay.cpp @@ -49,7 +49,7 @@ LLViewerParcelMediaAutoPlay::LLViewerParcelMediaAutoPlay() : LLEventTimer(1), mLastParcelID(-1), - mPlayed(FALSE), + mPlayed(false), mTimeInParcel(0) { } @@ -57,10 +57,10 @@ LLViewerParcelMediaAutoPlay::LLViewerParcelMediaAutoPlay() : // static void LLViewerParcelMediaAutoPlay::playStarted() { - LLSingleton<LLViewerParcelMediaAutoPlay>::getInstance()->mPlayed = TRUE; + LLSingleton<LLViewerParcelMediaAutoPlay>::getInstance()->mPlayed = true; } -BOOL LLViewerParcelMediaAutoPlay::tick() +bool LLViewerParcelMediaAutoPlay::tick() { LLParcel *this_parcel = NULL; LLViewerRegion *this_region = NULL; @@ -94,7 +94,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick() this_region_id != mLastRegionID) { // we've entered a new parcel - mPlayed = FALSE; // we haven't autoplayed yet + mPlayed = false; // we haven't autoplayed yet mTimeInParcel = 0; // reset our timer mLastParcelID = this_parcel_id; mLastRegionID = this_region_id; @@ -110,7 +110,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick() { if (this_media_texture_id.notNull()) // and if the media texture is good { - LLViewerMediaTexture *image = LLViewerTextureManager::getMediaTexture(this_media_texture_id, FALSE) ; + LLViewerMediaTexture *image = LLViewerTextureManager::getMediaTexture(this_media_texture_id, false) ; F32 image_size = 0; @@ -149,14 +149,14 @@ BOOL LLViewerParcelMediaAutoPlay::tick() } } - mPlayed = TRUE; + mPlayed = true; } } } } - return FALSE; // continue ticking forever please. + return false; // continue ticking forever please. } //static |