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

Maint X -> Maint B merge

1 files changed, 69 insertions, 69 deletions

diff --git a/indra/newview/llpanelgroupnotices.h b/indra/newview/llpanelgroupnotices.h
index 55319cb9ae..11578eef01 100644
--- a/indra/newview/llpanelgroupnotices.h
+++ b/indra/newview/llpanelgroupnotices.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelgroupnotices.h
  * @brief A panel to display group notices.
  *
  * $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$
  */
@@ -41,84 +41,84 @@ class LLScrollListCtrl;
 class LLPanelGroupNotices : public LLPanelGroupTab
 {
 public:
-	LLPanelGroupNotices();
-	virtual ~LLPanelGroupNotices();
+    LLPanelGroupNotices();
+    virtual ~LLPanelGroupNotices();
 
-	// LLPanelGroupTab
-	virtual void activate();
-	//virtual bool needsApply(std::string& mesg);
-	//virtual bool apply(std::string& mesg);
-	//virtual void update();
-	
-	virtual BOOL postBuild();
-	virtual BOOL isVisibleByAgent(LLAgent* agentp);
+    // LLPanelGroupTab
+    virtual void activate();
+    //virtual bool needsApply(std::string& mesg);
+    //virtual bool apply(std::string& mesg);
+    //virtual void update();
 
-	void setItem(LLPointer<LLInventoryItem> inv_item);
+    virtual BOOL postBuild();
+    virtual BOOL isVisibleByAgent(LLAgent* agentp);
 
-	static void processGroupNoticesListReply(LLMessageSystem* msg, void** data);
+    void setItem(LLPointer<LLInventoryItem> inv_item);
 
-	void showNotice(const std::string& subject,
-					const std::string& message,
-					const bool& has_inventory,
-					const std::string& inventory_name,
-					LLOfferInfo* inventory_offer);
+    static void processGroupNoticesListReply(LLMessageSystem* msg, void** data);
 
-	void refreshNotices();
+    void showNotice(const std::string& subject,
+                    const std::string& message,
+                    const bool& has_inventory,
+                    const std::string& inventory_name,
+                    LLOfferInfo* inventory_offer);
 
-	void clearNoticeList();
+    void refreshNotices();
 
-	virtual void setGroupID(const LLUUID& id);
+    void clearNoticeList();
+
+    virtual void setGroupID(const LLUUID& id);
 
 private:
-	static void onClickRemoveAttachment(void* data);
-	static void onClickOpenAttachment(void* data);
-	static void onClickSendMessage(void* data);
-	static void onClickNewMessage(void* data);
-	static void onClickRefreshNotices(void* data);
-
-	void processNotices(LLMessageSystem* msg);
-	static void onSelectNotice(LLUICtrl* ctrl, void* data);
-
-	enum ENoticeView
-	{
-		VIEW_PAST_NOTICE,
-		CREATE_NEW_NOTICE
-	};
-
-	void arrangeNoticeView(ENoticeView view_type);
-
-	LLPointer<LLInventoryItem>	mInventoryItem;
-	
-	LLLineEditor		*mCreateSubject;
-    LLLineEditor		*mCreateInventoryName;
-	LLTextEditor		*mCreateMessage;
-
-	LLLineEditor		*mViewSubject;
-    LLLineEditor		*mViewInventoryName;
-	LLTextEditor		*mViewMessage;
-	
-	LLButton			*mBtnSendMessage;
-	LLButton			*mBtnNewMessage;
-	LLButton			*mBtnRemoveAttachment;
-	LLButton			*mBtnOpenAttachment;
-	LLButton			*mBtnGetPastNotices;
-
-	LLPanel				*mPanelCreateNotice;
-	LLPanel				*mPanelViewNotice;
-
-	LLIconCtrl		 *mCreateInventoryIcon;
-	LLIconCtrl		 *mViewInventoryIcon;
-	
-	LLScrollListCtrl *mNoticesList;
+    static void onClickRemoveAttachment(void* data);
+    static void onClickOpenAttachment(void* data);
+    static void onClickSendMessage(void* data);
+    static void onClickNewMessage(void* data);
+    static void onClickRefreshNotices(void* data);
+
+    void processNotices(LLMessageSystem* msg);
+    static void onSelectNotice(LLUICtrl* ctrl, void* data);
+
+    enum ENoticeView
+    {
+        VIEW_PAST_NOTICE,
+        CREATE_NEW_NOTICE
+    };
+
+    void arrangeNoticeView(ENoticeView view_type);
+
+    LLPointer<LLInventoryItem>  mInventoryItem;
+
+    LLLineEditor        *mCreateSubject;
+    LLLineEditor        *mCreateInventoryName;
+    LLTextEditor        *mCreateMessage;
+
+    LLLineEditor        *mViewSubject;
+    LLLineEditor        *mViewInventoryName;
+    LLTextEditor        *mViewMessage;
+
+    LLButton            *mBtnSendMessage;
+    LLButton            *mBtnNewMessage;
+    LLButton            *mBtnRemoveAttachment;
+    LLButton            *mBtnOpenAttachment;
+    LLButton            *mBtnGetPastNotices;
+
+    LLPanel             *mPanelCreateNotice;
+    LLPanel             *mPanelViewNotice;
+
+    LLIconCtrl       *mCreateInventoryIcon;
+    LLIconCtrl       *mViewInventoryIcon;
+
+    LLScrollListCtrl *mNoticesList;
     std::set<LLUUID>  mKnownNoticeIds; // Dupplicate avoidance, to avoid searching and inserting dupplciates into mNoticesList
 
-	std::string		mNoNoticesStr;
+    std::string     mNoNoticesStr;
 
-	LLOfferInfo* mInventoryOffer;
+    LLOfferInfo* mInventoryOffer;
 
-	LLUUID mPrevSelectedNotice;
+    LLUUID mPrevSelectedNotice;
 
-	static std::map<LLUUID,LLPanelGroupNotices*>	sInstances;
+    static std::map<LLUUID,LLPanelGroupNotices*>    sInstances;
 };
 
 #endif