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

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llpanelgenerictip.h b/indra/newview/llpanelgenerictip.h
index f8a3413fe4..01d6c00d85 100644
--- a/indra/newview/llpanelgenerictip.h
+++ b/indra/newview/llpanelgenerictip.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpanelgenerictip.h
  * @brief Represents a generic panel for a notifytip notifications. As example:
  * "SystemMessageTip", "Cancelled", "UploadWebSnapshotDone".
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -36,16 +36,16 @@
  */
 class LLPanelGenericTip: public LLPanelTipToast
 {
-	// disallow instantiation of this class
+    // disallow instantiation of this class
 private:
-	// grant privileges to instantiate this class to LLToastPanel
-	friend class LLToastPanel;
-	/**
-	 * Generic toast tip panel.
-	 * This is particular case of toast panel that decoupled from LLToastNotifyPanel.
-	 * From now LLToastNotifyPanel is deprecated and will be removed after all  panel
-	 * types are represented in separate classes.
-	 */
-	LLPanelGenericTip(const LLNotificationPtr& notification);
+    // grant privileges to instantiate this class to LLToastPanel
+    friend class LLToastPanel;
+    /**
+     * Generic toast tip panel.
+     * This is particular case of toast panel that decoupled from LLToastNotifyPanel.
+     * From now LLToastNotifyPanel is deprecated and will be removed after all  panel
+     * types are represented in separate classes.
+     */
+    LLPanelGenericTip(const LLNotificationPtr& notification);
 };
 #endif /* LL_PANELGENERICTIP_H */