Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 54 insertions, 54 deletions

diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
index c40a865a5e..db3f4a2e32 100644
--- a/indra/newview/llprogressview.h
+++ b/indra/newview/llprogressview.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llprogressview.h
  * @brief LLProgressView class definition
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -37,70 +37,70 @@ class LLButton;
 class LLProgressBar;
 class LLViewerTexture;
 
-class LLProgressView : 
-	public LLPanel,
-	public LLViewerMediaObserver
+class LLProgressView :
+    public LLPanel,
+    public LLViewerMediaObserver
 
 {
-	LOG_CLASS(LLProgressView);
+    LOG_CLASS(LLProgressView);
 
 public:
-	LLProgressView();
-	virtual ~LLProgressView();
-	
-	bool postBuild();
+    LLProgressView();
+    virtual ~LLProgressView();
+
+    bool postBuild();
+
+    /*virtual*/ void draw();
+    void drawStartTexture(F32 alpha);
+    void drawLogos(F32 alpha);
 
-	/*virtual*/ void draw();
-	void drawStartTexture(F32 alpha);
-	void drawLogos(F32 alpha);
+    /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask);
+    /*virtual*/ bool handleKeyHere(KEY key, MASK mask);
+    /*virtual*/ void setVisible(bool visible);
 
-	/*virtual*/ bool handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ bool handleKeyHere(KEY key, MASK mask);
-	/*virtual*/ void setVisible(bool visible);
+    // inherited from LLViewerMediaObserver
+    /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
-	// inherited from LLViewerMediaObserver
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+    void setText(const std::string& text);
+    void setPercent(const F32 percent);
 
-	void setText(const std::string& text);
-	void setPercent(const F32 percent);
+    // Set it to NULL when you want to eliminate the message.
+    void setMessage(const std::string& msg);
 
-	// Set it to NULL when you want to eliminate the message.
-	void setMessage(const std::string& msg);
-	
-	// turns on (under certain circumstances) the into video after login
-	void revealIntroPanel();
+    // turns on (under certain circumstances) the into video after login
+    void revealIntroPanel();
 
-	void setStartupComplete();
+    void setStartupComplete();
 
-	// we have to preload local textures to make sure they won't be grey
-	void initTextures(S32 location_id, bool is_in_production);
-	void releaseTextures();
+    // we have to preload local textures to make sure they won't be grey
+    void initTextures(S32 location_id, bool is_in_production);
+    void releaseTextures();
 
-	void setCancelButtonVisible(bool b, const std::string& label);
+    void setCancelButtonVisible(bool b, const std::string& label);
 
-	static void onCancelButtonClicked( void* );
-	static void onClickMessage(void*);
-	bool onAlertModal(const LLSD& sd);
+    static void onCancelButtonClicked( void* );
+    static void onClickMessage(void*);
+    bool onAlertModal(const LLSD& sd);
 
 protected:
-	LLProgressBar* mProgressBar;
-	LLMediaCtrl* mMediaCtrl;
-	F32 mPercentDone;
-	std::string mMessage;
-	LLButton*	mCancelBtn;
-	LLFrameTimer mFadeToWorldTimer;
-	LLFrameTimer mFadeFromLoginTimer;
-	LLRect mOutlineRect;
-	bool mMouseDownInActiveArea;
-	bool mStartupComplete;
-
-	// The LLEventStream mUpdateEvents depends upon this class being a singleton
-	// to avoid pump name conflicts.
-	static LLProgressView* sInstance;
-	LLEventStream mUpdateEvents; 
-
-	bool handleUpdate(const LLSD& event_data);
-	static void onIdle(void* user_data);
+    LLProgressBar* mProgressBar;
+    LLMediaCtrl* mMediaCtrl;
+    F32 mPercentDone;
+    std::string mMessage;
+    LLButton*   mCancelBtn;
+    LLFrameTimer mFadeToWorldTimer;
+    LLFrameTimer mFadeFromLoginTimer;
+    LLRect mOutlineRect;
+    bool mMouseDownInActiveArea;
+    bool mStartupComplete;
+
+    // The LLEventStream mUpdateEvents depends upon this class being a singleton
+    // to avoid pump name conflicts.
+    static LLProgressView* sInstance;
+    LLEventStream mUpdateEvents;
+
+    bool handleUpdate(const LLSD& event_data);
+    static void onIdle(void* user_data);
     void loadLogo(const std::string &path, const U8 image_codec, const LLRect &pos_rect, const LLRectf &clip_rect, const LLRectf &offset_rect);
     // logos have unusual location and need to be preloaded to not appear grey, then deleted
     void initLogos();