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

Maint X -> Materials Featurette merge

1 files changed, 18 insertions, 18 deletions

diff --git a/indra/newview/llfloaterexperiencepicker.h b/indra/newview/llfloaterexperiencepicker.h
index 29054a57db..49f96dfea0 100644
--- a/indra/newview/llfloaterexperiencepicker.h
+++ b/indra/newview/llfloaterexperiencepicker.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llfloaterexperiencepicker.h
 * @brief  Header file for llfloaterexperiencepicker
 * @author dolphin@lindenlab.com
@@ -38,29 +38,29 @@ class LLFloaterExperiencePicker : public LLFloater
 {
 public:
 
-	typedef boost::function<void (const uuid_vec_t&)> select_callback_t;
-	// filter function for experiences, return true if the experience should be hidden.
-	typedef boost::function<bool (const LLSD&)> filter_function;
-	typedef std::vector<filter_function> filter_list;
+    typedef boost::function<void (const uuid_vec_t&)> select_callback_t;
+    // filter function for experiences, return true if the experience should be hidden.
+    typedef boost::function<bool (const LLSD&)> filter_function;
+    typedef std::vector<filter_function> filter_list;
 
-	static LLFloaterExperiencePicker* show( select_callback_t callback, const LLUUID& key, BOOL allow_multiple, BOOL close_on_select, filter_list filters, LLView * frustumOrigin);
+    static LLFloaterExperiencePicker* show( select_callback_t callback, const LLUUID& key, BOOL allow_multiple, BOOL close_on_select, filter_list filters, LLView * frustumOrigin);
 
-	LLFloaterExperiencePicker(const LLSD& key);
-	virtual ~LLFloaterExperiencePicker();
+    LLFloaterExperiencePicker(const LLSD& key);
+    virtual ~LLFloaterExperiencePicker();
 
-	BOOL postBuild();
-	
-	virtual void	draw();
+    BOOL postBuild();
+
+    virtual void    draw();
 private:
 
-	LLPanelExperiencePicker* mSearchPanel;
+    LLPanelExperiencePicker* mSearchPanel;
 
-	void drawFrustum();
-	LLHandle <LLView>   mFrustumOrigin;
-	F32		            mContextConeOpacity;
-	F32                 mContextConeInAlpha;
-	F32                 mContextConeOutAlpha;
-	F32                 mContextConeFadeTime;
+    void drawFrustum();
+    LLHandle <LLView>   mFrustumOrigin;
+    F32                 mContextConeOpacity;
+    F32                 mContextConeInAlpha;
+    F32                 mContextConeOutAlpha;
+    F32                 mContextConeFadeTime;
 };
 
 #endif // LL_LLFLOATEREXPERIENCEPICKER_H