Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h
index 6ecc78afa0..70e9b092cb 100644
--- a/indra/newview/llpanelcontents.h
+++ b/indra/newview/llpanelcontents.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelcontents.h
  * @brief Object contents panel in the tools floater.
  *
  * $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
  * 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$
  */
@@ -43,17 +43,17 @@ class LLSpinCtrl;
 class LLPanelContents : public LLPanel
 {
 public:
-	virtual	BOOL postBuild();
-	LLPanelContents();
-	virtual ~LLPanelContents();
+    virtual BOOL postBuild();
+    LLPanelContents();
+    virtual ~LLPanelContents();
+
+    void            refresh();
+    void            clearContents();
 
-	void			refresh();
-	void			clearContents();
 
+    static void     onClickNewScript(void*);
+    static void     onClickPermissions(void*);
 
-	static void		onClickNewScript(void*);
-	static void		onClickPermissions(void*);
-	
     // Key suffix for "tentative" fields
     static const char* TENTATIVE_SUFFIX;
 
@@ -66,10 +66,10 @@ public:
     static const char* PERMS_ANYONE_CONTROL_KEY;
 
 protected:
-	void				getState(LLViewerObject *object);
+    void                getState(LLViewerObject *object);
 
 public:
-	LLPanelObjectInventory* mPanelInventoryObject;
+    LLPanelObjectInventory* mPanelInventoryObject;
 };
 
 #endif // LL_LLPANELCONTENTS_H