Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h
index d6da04b281..bb407b3799 100644
--- a/indra/newview/lleventpoll.h
+++ b/indra/newview/lleventpoll.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lleventpoll.h
  * @brief LLEvDescription of the LLEventPoll class.
  *
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -40,14 +40,14 @@ namespace Details
 
 
 class LLEventPoll
-	///< implements the viewer side of server-to-viewer pushed events.
+    ///< implements the viewer side of server-to-viewer pushed events.
 {
 public:
-	LLEventPoll(const std::string& pollURL, const LLHost& sender);
-		///< Start polling the URL.
+    LLEventPoll(const std::string& pollURL, const LLHost& sender);
+        ///< Start polling the URL.
 
-	virtual ~LLEventPoll();
-		///< will stop polling, canceling any poll in progress.
+    virtual ~LLEventPoll();
+        ///< will stop polling, canceling any poll in progress.
 
 
 private: