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

Maint X -> Maint B merge

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h
index 6d0559af7c..6fb77c5935 100644
--- a/indra/newview/llfloaterexperiences.h
+++ b/indra/newview/llfloaterexperiences.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaterexperiences.h
  * @brief LLFloaterExperiences class definition
  *
  * $LicenseInfo:firstyear=2012&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2012, 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$
  */
@@ -33,7 +33,7 @@
 class LLPanelExperiences;
 
 class LLFloaterExperiences :
-	public LLFloater
+    public LLFloater
 {
 public:
     LLFloaterExperiences(const LLSD& data);
@@ -47,16 +47,16 @@ protected:
 
     void clearFromRecent(const LLSD& ids);
     void resizeToTabs();
-	/*virtual*/ BOOL	postBuild();
+    /*virtual*/ BOOL    postBuild();
     void refreshContents();
     void setupRecentTabs();
     LLPanelExperiences* addTab(const std::string& name, bool select);
 
     bool updatePermissions(const LLSD& permission);
-	void sendPurchaseRequest();
-	void checkPurchaseInfo(LLPanelExperiences* panel, const LLSD& content)const;
+    void sendPurchaseRequest();
+    void checkPurchaseInfo(LLPanelExperiences* panel, const LLSD& content)const;
     void checkAndOpen(LLPanelExperiences* panel, const LLSD& content) const;
-	void updateInfo(std::string experiences, std::string tab);
+    void updateInfo(std::string experiences, std::string tab);
 
     void retrieveExperienceList(const std::string &url, const LLHandle<LLFloaterExperiences> &hparent, const NameMap_t &tabMapping,
         const std::string &errorNotify = std::string("ErrorMessage"), Callback_t cback = Callback_t());
@@ -68,7 +68,7 @@ private:
     typedef boost::function < LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t, LLCore::HttpRequest::ptr_t,
         const std::string, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t) > invokationFn_t;
 
-    static void retrieveExperienceListCoro(std::string url, LLHandle<LLFloaterExperiences> hparent, 
+    static void retrieveExperienceListCoro(std::string url, LLHandle<LLFloaterExperiences> hparent,
         NameMap_t tabMapping, std::string errorNotify, Callback_t cback, invokationFn_t invoker);
     std::vector<LLUUID> mPrepurchaseIds;
 };