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

Maint X -> Maint B merge

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llpanelgenerictip.cpp b/indra/newview/llpanelgenerictip.cpp
index 4ccdaa78f3..bc2b28269f 100644
--- a/indra/newview/llpanelgenerictip.cpp
+++ b/indra/newview/llpanelgenerictip.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpanelgenerictip.cpp
  * @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$
  */
@@ -33,15 +33,15 @@
 
 
 LLPanelGenericTip::LLPanelGenericTip(
-		const LLNotificationPtr& notification) :
-		LLPanelTipToast(notification)
+        const LLNotificationPtr& notification) :
+        LLPanelTipToast(notification)
 {
-	buildFromFile( "panel_generic_tip.xml");
+    buildFromFile( "panel_generic_tip.xml");
 
-	getChild<LLUICtrl>("message")->setValue(notification->getMessage());
+    getChild<LLUICtrl>("message")->setValue(notification->getMessage());
 
 
-	S32 max_line_count =  gSavedSettings.getS32("TipToastMessageLineCount");
-	snapToMessageHeight(getChild<LLTextBox> ("message"), max_line_count);
+    S32 max_line_count =  gSavedSettings.getS32("TipToastMessageLineCount");
+    snapToMessageHeight(getChild<LLTextBox> ("message"), max_line_count);
 }