Merge pull request #1373 from secondlife/marchcat/x-ws-merge

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h
index ed90055d95..071b907cd9 100644
--- a/indra/newview/llfloaterevent.h
+++ b/indra/newview/llfloaterevent.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaterevent.h
  * @brief Display for events in the finder
  *
  * $LicenseInfo:firstyear=2004&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$
  */
@@ -39,23 +39,23 @@ class LLFloaterEvent : public LLFloater,
 
 {
 public:
-	LLFloaterEvent(const LLSD& key);
-	/*virtual*/ ~LLFloaterEvent();
+    LLFloaterEvent(const LLSD& key);
+    /*virtual*/ ~LLFloaterEvent();
 
-	/*virtual*/ BOOL postBuild();
+    /*virtual*/ BOOL postBuild();
 
-	void setEventID(const U32 event_id);
+    void setEventID(const U32 event_id);
 
-	U32 getEventID() { return mEventID; }
+    U32 getEventID() { return mEventID; }
 
 
 
 protected:
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event);	
-	
-	U32				mEventID;
+    /*virtual*/ void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event);
+
+    U32             mEventID;
 
-	LLMediaCtrl*	mBrowser;
+    LLMediaCtrl*    mBrowser;
 
 };