Manual whitespace cleanup (fix_whitespace.py).

1 files changed, 104 insertions, 104 deletions

diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp
index 8cf86910e7..d9575e0b2b 100644
--- a/indra/newview/llviewerparcelmediaautoplay.cpp
+++ b/indra/newview/llviewerparcelmediaautoplay.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -46,11 +46,11 @@ const F32 AUTOPLAY_SIZE  = 24*24;      // how big the texture must be (pixel are
 const F32 AUTOPLAY_SPEED = 0.1f;        // how slow should the agent be moving to autoplay
 
 LLViewerParcelMediaAutoPlay::LLViewerParcelMediaAutoPlay() :
-	LLEventTimer(1),
-	
-	mLastParcelID(-1),
-	mPlayed(FALSE),
-	mTimeInParcel(0)
+    LLEventTimer(1),
+
+    mLastParcelID(-1),
+    mPlayed(FALSE),
+    mTimeInParcel(0)
 {
 }
 
@@ -62,101 +62,101 @@ void LLViewerParcelMediaAutoPlay::playStarted()
 
 bool LLViewerParcelMediaAutoPlay::tick()
 {
-	LLParcel *this_parcel = NULL;
-	LLViewerRegion *this_region = NULL;
-	std::string this_media_url;
-	std::string this_media_type;
-	LLUUID this_media_texture_id;
-	S32 this_parcel_id = 0;
-	LLUUID this_region_id;
-
-	this_region = gAgent.getRegion();
-	
-	if (this_region)
-	{
-		this_region_id = this_region->getRegionID();
-	}
-
-	this_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-
-	if (this_parcel)
-	{
-		this_media_url = this_parcel->getMediaURL();
-		
-		this_media_type = this_parcel->getMediaType();
-
-		this_media_texture_id = this_parcel->getMediaID();
-
-		this_parcel_id = this_parcel->getLocalID();
-	}
-
-	if (this_parcel_id != mLastParcelID ||
-	    this_region_id != mLastRegionID)
-	{
-		// we've entered a new parcel
-		mPlayed    = FALSE;                   // we haven't autoplayed yet
-		mTimeInParcel = 0;                    // reset our timer
-		mLastParcelID = this_parcel_id;
-		mLastRegionID = this_region_id;
-	}
-
-	mTimeInParcel += mPeriod;					// increase mTimeInParcel by the amount of time between ticks
-
-	if ((!mPlayed) &&							// if we've never played
-		(mTimeInParcel > AUTOPLAY_TIME) &&		// and if we've been here for so many seconds
-		(!this_media_url.empty()) &&			// and if the parcel has media
-		(stricmp(this_media_type.c_str(), LLMIMETypes::getDefaultMimeType().c_str()) != 0) &&
-		(!LLViewerParcelMedia::getInstance()->hasParcelMedia()))	// and if the media is not already playing
-	{
-		if (this_media_texture_id.notNull())	// and if the media texture is good
-		{
-			LLViewerMediaTexture *image = LLViewerTextureManager::getMediaTexture(this_media_texture_id, FALSE) ;
-
-			F32 image_size = 0;
-
-			if (image)
-			{
-				image_size = image->getMaxVirtualSize() ;
-			}
-
-			if (gAgent.getVelocity().magVec() < AUTOPLAY_SPEED) // and if the agent is stopped (slow enough)
-			{
-				if (image_size > AUTOPLAY_SIZE)    // and if the target texture is big enough on screen
-				{
-					if (this_parcel)
-					{
-						static LLCachedControl<S32> autoplay_mode(gSavedSettings, "ParcelMediaAutoPlayEnable");
-
-						switch (autoplay_mode())
-						{
-							case 0:
-								// Disabled
-								break;
-							case 1:
-								// Play, default value for ParcelMediaAutoPlayEnable
-								LLViewerParcelMedia::getInstance()->play(this_parcel);
-								break;
-							case 2:
-							default:
-							{
-								// Ask
-								LLViewerParcelAskPlay::getInstance()->askToPlay(this_region->getRegionID(),
-																				this_parcel->getLocalID(),
-																				this_parcel->getMediaURL(),
-																				onStartMediaResponse);
-								break;
-  							}
-  						}
-					}
-
-					mPlayed = TRUE;
-				}
-			}
-		}
-	}
-
-
-	return false; // continue ticking forever please.
+    LLParcel *this_parcel = NULL;
+    LLViewerRegion *this_region = NULL;
+    std::string this_media_url;
+    std::string this_media_type;
+    LLUUID this_media_texture_id;
+    S32 this_parcel_id = 0;
+    LLUUID this_region_id;
+
+    this_region = gAgent.getRegion();
+
+    if (this_region)
+    {
+        this_region_id = this_region->getRegionID();
+    }
+
+    this_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+
+    if (this_parcel)
+    {
+        this_media_url = this_parcel->getMediaURL();
+
+        this_media_type = this_parcel->getMediaType();
+
+        this_media_texture_id = this_parcel->getMediaID();
+
+        this_parcel_id = this_parcel->getLocalID();
+    }
+
+    if (this_parcel_id != mLastParcelID ||
+        this_region_id != mLastRegionID)
+    {
+        // we've entered a new parcel
+        mPlayed    = FALSE;                   // we haven't autoplayed yet
+        mTimeInParcel = 0;                    // reset our timer
+        mLastParcelID = this_parcel_id;
+        mLastRegionID = this_region_id;
+    }
+
+    mTimeInParcel += mPeriod;                   // increase mTimeInParcel by the amount of time between ticks
+
+    if ((!mPlayed) &&                           // if we've never played
+        (mTimeInParcel > AUTOPLAY_TIME) &&      // and if we've been here for so many seconds
+        (!this_media_url.empty()) &&            // and if the parcel has media
+        (stricmp(this_media_type.c_str(), LLMIMETypes::getDefaultMimeType().c_str()) != 0) &&
+        (!LLViewerParcelMedia::getInstance()->hasParcelMedia()))    // and if the media is not already playing
+    {
+        if (this_media_texture_id.notNull())    // and if the media texture is good
+        {
+            LLViewerMediaTexture *image = LLViewerTextureManager::getMediaTexture(this_media_texture_id, FALSE) ;
+
+            F32 image_size = 0;
+
+            if (image)
+            {
+                image_size = image->getMaxVirtualSize() ;
+            }
+
+            if (gAgent.getVelocity().magVec() < AUTOPLAY_SPEED) // and if the agent is stopped (slow enough)
+            {
+                if (image_size > AUTOPLAY_SIZE)    // and if the target texture is big enough on screen
+                {
+                    if (this_parcel)
+                    {
+                        static LLCachedControl<S32> autoplay_mode(gSavedSettings, "ParcelMediaAutoPlayEnable");
+
+                        switch (autoplay_mode())
+                        {
+                            case 0:
+                                // Disabled
+                                break;
+                            case 1:
+                                // Play, default value for ParcelMediaAutoPlayEnable
+                                LLViewerParcelMedia::getInstance()->play(this_parcel);
+                                break;
+                            case 2:
+                            default:
+                            {
+                                // Ask
+                                LLViewerParcelAskPlay::getInstance()->askToPlay(this_region->getRegionID(),
+                                                                                this_parcel->getLocalID(),
+                                                                                this_parcel->getMediaURL(),
+                                                                                onStartMediaResponse);
+                                break;
+                            }
+                        }
+                    }
+
+                    mPlayed = TRUE;
+                }
+            }
+        }
+    }
+
+
+    return false; // continue ticking forever please.
 }
 
 //static