Post-merge - trim trailing whitespace

2 files changed, 13 insertions, 13 deletions

diff --git a/indra/llui/llviewereventrecorder.h b/indra/llui/llviewereventrecorder.h
index e749e1ab57..9e752e8090 100644
--- a/indra/llui/llviewereventrecorder.h
+++ b/indra/llui/llviewereventrecorder.h
@@ -3,22 +3,22 @@
  * @brief Viewer event recording and playback support for mouse and keyboard events
  *
  * $LicenseInfo:firstyear=2013&license=viewerlgpl$
- * 
+ *
  * Copyright (c) 2013, 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$
  */
@@ -27,10 +27,10 @@
 #define LL_VIEWER_EVENT_RECORDER
 
 
-#include "linden_common.h" 
+#include "linden_common.h"
 
-#include "lldir.h" 
-#include "llsd.h"  
+#include "lldir.h"
+#include "llsd.h"
 #include "llfile.h"
 #include "lldate.h"
 #include "llsdserialize.h"
@@ -46,7 +46,7 @@ class LLViewerEventRecorder : public LLSimpleton<LLViewerEventRecorder>
 public:
     LLViewerEventRecorder();
     ~LLViewerEventRecorder();
-   
+
   void updateMouseEventInfo(S32 local_x,S32 local_y, S32 global_x, S32 global_y,  std::string mName);
   void setMouseLocalCoords(S32 x,S32 y);
   void setMouseGlobalCoords(S32 x,S32 y);
@@ -75,12 +75,12 @@ public:
   bool logEvents;
 
   std::string mLogFilename;
-  llofstream  mLog; 
+  llofstream  mLog;
 
 
  private:
 
-  // Mouse event info 
+  // Mouse event info
   S32 global_x;
   S32 global_y;
   S32 local_x;
@@ -92,7 +92,7 @@ public:
   // Actually write the event out to llsd log file
   void recordEvent(LLSD event);
 
-  void clear(S32 r); 
+  void clear(S32 r);
 
   static const S32 UNDEFINED=-1;
 };
diff --git a/indra/llui/llxyvector.cpp b/indra/llui/llxyvector.cpp
index 40d5d8c903..19bd8465b9 100644
--- a/indra/llui/llxyvector.cpp
+++ b/indra/llui/llxyvector.cpp
@@ -25,7 +25,7 @@
 * $/LicenseInfo$
 */
 
-// A control that allows to set two related vector magnitudes by manipulating a single vector on a plane. 
+// A control that allows to set two related vector magnitudes by manipulating a single vector on a plane.
 
 #include "linden_common.h"
 
@@ -158,7 +158,7 @@ void drawArrow(S32 tailX, S32 tailY, S32 tipX, S32 tipY, LLColor4 color)
     S32 dy = tipY - tailY;
 
     S32 arrowLength = (abs(dx) < ARROW_LENGTH_LONG && abs(dy) < ARROW_LENGTH_LONG) ? ARROW_LENGTH_SHORT : ARROW_LENGTH_LONG;
-   
+
     F32 theta = std::atan2(dy, dx);
 
     F32 rad = ARROW_ANGLE * std::atan(1) * 4 / 180;