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

Maint X -> Maint B merge

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llpanelgroupbulkban.h b/indra/newview/llpanelgroupbulkban.h
index 9060d275f9..d7b2ed6e67 100644
--- a/indra/newview/llpanelgroupbulkban.h
+++ b/indra/newview/llpanelgroupbulkban.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llpanelgroupbulkban.h
 *
 * $LicenseInfo:firstyear=2013&license=viewerlgpl$
@@ -35,15 +35,15 @@ class LLAvatarName;
 class LLPanelGroupBulkBan : public LLPanelGroupBulk
 {
 public:
-	LLPanelGroupBulkBan(const LLUUID& group_id);
-	~LLPanelGroupBulkBan() {}
+    LLPanelGroupBulkBan(const LLUUID& group_id);
+    ~LLPanelGroupBulkBan() {}
 
-	virtual BOOL postBuild();
+    virtual BOOL postBuild();
 
-	static void callbackClickSubmit(void* userdata);
-	virtual void submit();
+    static void callbackClickSubmit(void* userdata);
+    virtual void submit();
 private:
-	std::string buildResidentsArgument(std::vector<LLAvatarName> avatar_names, const std::string &format);
+    std::string buildResidentsArgument(std::vector<LLAvatarName> avatar_names, const std::string &format);
 };
 
 #endif // LL_LLPANELGROUPBULKBAN_H