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

Maint X -> Maint B merge

1 files changed, 95 insertions, 95 deletions

diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h
index 78d43f97a9..e7bd5031e9 100644
--- a/indra/newview/llfloatermarketplacelistings.h
+++ b/indra/newview/llfloatermarketplacelistings.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloatermarketplacelistings.h
  * @brief Implementation of the marketplace listings floater and panels
  * @author merov@lindenlab.com
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2001&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
  * ABILITY 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$
  */
@@ -52,36 +52,36 @@ class LLPanelMarketplaceListings : public LLPanel
 {
 public:
     LLPanelMarketplaceListings();
-	BOOL postBuild();
-	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-						   EDragAndDropType cargo_type,
-						   void* cargo_data,
-						   EAcceptance* accept,
-						   std::string& tooltip_msg);
-	void draw();
-	LLFolderView* getRootFolder() { return mRootFolder; }
+    BOOL postBuild();
+    BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+                           EDragAndDropType cargo_type,
+                           void* cargo_data,
+                           EAcceptance* accept,
+                           std::string& tooltip_msg);
+    void draw();
+    LLFolderView* getRootFolder() { return mRootFolder; }
     bool allowDropOnRoot();
-    
+
     void buildAllPanels();
-    
+
 private:
     LLInventoryPanel* buildInventoryPanel(const std::string& childname, const std::string& filename);
 
     // UI callbacks
-	void onViewSortMenuItemClicked(const LLSD& userdata);
-	bool onViewSortMenuItemCheck(const LLSD& userdata);
-	void onAddButtonClicked();
+    void onViewSortMenuItemClicked(const LLSD& userdata);
+    bool onViewSortMenuItemCheck(const LLSD& userdata);
+    void onAddButtonClicked();
     void onAuditButtonClicked();
-	void onSelectionChange(LLInventoryPanel *panel, const std::deque<LLFolderViewItem*>& items, BOOL user_action);
+    void onSelectionChange(LLInventoryPanel *panel, const std::deque<LLFolderViewItem*>& items, BOOL user_action);
     void onTabChange();
     void onFilterEdit(const std::string& search_string);
-    
+
     void setSortOrder(U32 sort_order);
-    
+
     LLFolderView*     mRootFolder;
     LLButton*         mAuditBtn;
-	LLFilterEditor*	  mFilterEditor;
-	std::string		  mFilterSubString;
+    LLFilterEditor*   mFilterEditor;
+    std::string       mFilterSubString;
     bool              mFilterListingFoldersOnly;
     U32               mSortOrder;
 };
@@ -93,55 +93,55 @@ private:
 class LLFloaterMarketplaceListings : public LLFloater
 {
 public:
-	LLFloaterMarketplaceListings(const LLSD& key);
-	~LLFloaterMarketplaceListings();
-	
-	void initializeMarketPlace();
-    
-	// virtuals
-	BOOL postBuild();
-	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-						   EDragAndDropType cargo_type,
-						   void* cargo_data,
-						   EAcceptance* accept,
-						   std::string& tooltip_msg);
-	
-	void showNotification(const LLNotificationPtr& notification);
-    
-	BOOL handleHover(S32 x, S32 y, MASK mask);
-	void onMouseLeave(S32 x, S32 y, MASK mask);
-    
+    LLFloaterMarketplaceListings(const LLSD& key);
+    ~LLFloaterMarketplaceListings();
+
+    void initializeMarketPlace();
+
+    // virtuals
+    BOOL postBuild();
+    BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+                           EDragAndDropType cargo_type,
+                           void* cargo_data,
+                           EAcceptance* accept,
+                           std::string& tooltip_msg);
+
+    void showNotification(const LLNotificationPtr& notification);
+
+    BOOL handleHover(S32 x, S32 y, MASK mask);
+    void onMouseLeave(S32 x, S32 y, MASK mask);
+
 protected:
-	void setRootFolder();
-	void setPanels();
+    void setRootFolder();
+    void setPanels();
     bool fetchContents();
 
-	void setStatusString(const std::string& statusString);
+    void setStatusString(const std::string& statusString);
+
+    void onClose(bool app_quitting);
+    void onOpen(const LLSD& key);
+    void onFocusReceived();
+    void onChanged();
 
-	void onClose(bool app_quitting);
-	void onOpen(const LLSD& key);
-	void onFocusReceived();
-	void onChanged();
-    
     bool isAccepted(EAcceptance accept);
-	
-	void updateView();
-    
+
+    void updateView();
+
 private:
     S32 getFolderCount();
 
-	LLInventoryCategoriesObserver *		mCategoriesObserver;
-	LLInventoryCategoryAddedObserver *	mCategoryAddedObserver;
-		
-	LLTextBox *		mInventoryStatus;
-	LLView *		mInventoryInitializationInProgress;
-	LLView *		mInventoryPlaceholder;
-	LLTextBox *		mInventoryText;
-	LLTextBox *		mInventoryTitle;
+    LLInventoryCategoriesObserver *     mCategoriesObserver;
+    LLInventoryCategoryAddedObserver *  mCategoryAddedObserver;
 
-	LLUUID			mRootFolderId;
+    LLTextBox *     mInventoryStatus;
+    LLView *        mInventoryInitializationInProgress;
+    LLView *        mInventoryPlaceholder;
+    LLTextBox *     mInventoryText;
+    LLTextBox *     mInventoryTitle;
+
+    LLUUID          mRootFolderId;
     bool            mRootFolderCreating;
-	LLPanelMarketplaceListings * mPanelListings;
+    LLPanelMarketplaceListings * mPanelListings;
     bool            mPanelListingsSet;
 };
 
@@ -150,23 +150,23 @@ private:
 //-----------------------------------------------------------------------------
 class LLFloaterAssociateListing : public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 public:
-	virtual BOOL postBuild();
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
-    
-	static LLFloaterAssociateListing* show(const LLUUID& folder_id);
-    
+    virtual BOOL postBuild();
+    virtual BOOL handleKeyHere(KEY key, MASK mask);
+
+    static LLFloaterAssociateListing* show(const LLUUID& folder_id);
+
 private:
-	LLFloaterAssociateListing(const LLSD& key);
-	virtual ~LLFloaterAssociateListing();
-    
-	// UI Callbacks
-	void apply(BOOL user_confirm = TRUE);
-	void cancel();
+    LLFloaterAssociateListing(const LLSD& key);
+    virtual ~LLFloaterAssociateListing();
+
+    // UI Callbacks
+    void apply(BOOL user_confirm = TRUE);
+    void cancel();
     void callback_apply(const LLSD& notification, const LLSD& response);
-    
-	LLUUID mUUID;
+
+    LLUUID mUUID;
 };
 
 //-----------------------------------------------------------------------------
@@ -181,24 +181,24 @@ private:
 class LLFloaterMarketplaceValidation : public LLFloater
 {
 public:
-	LLFloaterMarketplaceValidation(const LLSD& key);
-	virtual ~LLFloaterMarketplaceValidation();
-    
-	virtual BOOL postBuild();
-	virtual void draw();
-	virtual void onOpen(const LLSD& key);
-    
+    LLFloaterMarketplaceValidation(const LLSD& key);
+    virtual ~LLFloaterMarketplaceValidation();
+
+    virtual BOOL postBuild();
+    virtual void draw();
+    virtual void onOpen(const LLSD& key);
+
     void clearMessages();
     void appendMessage(std::string& message, S32 depth, LLError::ELevel log_level);
-	static void	onOK( void* userdata );
-    
+    static void onOK( void* userdata );
+
 private:
     struct Message {
         LLError::ELevel mErrorLevel;
         std::string mMessage;
     };
-	typedef std::vector<Message> message_list_t;
-    
+    typedef std::vector<Message> message_list_t;
+
     void handleCurrentListing();
 
     message_list_t mCurrentListingMessages;
@@ -206,7 +206,7 @@ private:
 
     message_list_t mMessages;
 
-    LLTextEditor*	mEditor;
+    LLTextEditor*   mEditor;
 };
 
 //-----------------------------------------------------------------------------
@@ -216,19 +216,19 @@ private:
 class LLFloaterItemProperties : public LLFloater
 {
 public:
-	LLFloaterItemProperties(const LLSD& key);
-	virtual ~LLFloaterItemProperties();
-    
-	BOOL postBuild();
-	virtual void onOpen(const LLSD& key);
-    
+    LLFloaterItemProperties(const LLSD& key);
+    virtual ~LLFloaterItemProperties();
+
+    BOOL postBuild();
+    virtual void onOpen(const LLSD& key);
+
 private:
 };
 
 class LLMultiItemProperties : public LLMultiFloater
 {
 public:
-	LLMultiItemProperties(const LLSD& key);
+    LLMultiItemProperties(const LLSD& key);
 };
 
 #endif // LL_LLFLOATERMARKETPLACELISTINGS_H