Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/llui/llhelp.h b/indra/llui/llhelp.h
index 1726347a78..829a080655 100644
--- a/indra/llui/llhelp.h
+++ b/indra/llui/llhelp.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llhelp.h
  * @brief Abstract interface to the Help system
  * @author Tofu Linden
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -31,14 +31,14 @@
 class LLHelp
 {
  public:
-	virtual void showTopic(const std::string &topic) = 0;
-	virtual std::string getURL(const std::string &topic) = 0;
-	// return default (fallback) topic name suitable for showTopic()
-	virtual std::string defaultTopic() = 0;
-	// return topic to use before the user logs in
-	virtual std::string preLoginTopic() = 0;
-	// return topic to use for the top-level help, invoked by F1
-	virtual std::string f1HelpTopic() = 0;
+    virtual void showTopic(const std::string &topic) = 0;
+    virtual std::string getURL(const std::string &topic) = 0;
+    // return default (fallback) topic name suitable for showTopic()
+    virtual std::string defaultTopic() = 0;
+    // return topic to use before the user logs in
+    virtual std::string preLoginTopic() = 0;
+    // return topic to use for the top-level help, invoked by F1
+    virtual std::string f1HelpTopic() = 0;
 };
 
 #endif // headerguard