Fix whitespace pre-commit hook failures

8 files changed, 79 insertions, 79 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
index abb899a876..2cb7ff196b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file class1\deferred\terrainF.glsl
  *
  * $LicenseInfo:firstyear=2023&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2023, 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$
  */
@@ -153,7 +153,7 @@ float terrain_mix(TerrainMix tm, vec4 tms4);
 vec3 mikktspace(vec3 vNt, vec3 vT)
 {
     vec3 vN = vary_normal;
-    
+
     vec3 vB = vary_sign * cross(vN, vT);
     vec3 tnorm = normalize( vNt.x * vT + vNt.y * vB + vNt.z * vN );
 
@@ -378,7 +378,7 @@ void main()
     vec3 tnorm = vary_normal;
 #endif
     tnorm *= gl_FrontFacing ? 1.0 : -1.0;
-   
+
 
 #if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_EMISSIVE)
 #define mix_emissive pbr_mix.emissive
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl
index 7a7fd783ec..1ae9efe544 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file class1\deferred\pbrterrainUtilF.glsl
  *
  * $LicenseInfo:firstyear=2023&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2023, 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$
  */
@@ -374,7 +374,7 @@ PBRMix terrain_sample_pbr(
     default:
         break;
     }
-    
+
     return mix;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
index 5c79fd7315..1fd31e0546 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
@@ -1,28 +1,28 @@
-/** 
+/**
  * @file class1\deferred\terrainF.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2007, 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$
  */
- 
+
 /*[EXTRA_CODE_HERE]*/
 
 out vec4 frag_data[4];
@@ -44,7 +44,7 @@ void main()
 {
     mirrorClip(pos);
     /// Note: This should duplicate the blending functionality currently used for the terrain rendering.
-    
+
     vec4 color0 = texture(detail_0, vary_texcoord0.xy);
     vec4 color1 = texture(detail_1, vary_texcoord0.xy);
     vec4 color2 = texture(detail_2, vary_texcoord0.xy);
@@ -54,9 +54,9 @@ void main()
     float alpha2 = texture(alpha_ramp,vary_texcoord1.xy).a;
     float alphaFinal = texture(alpha_ramp, vary_texcoord1.zw).a;
     vec4 outColor = mix( mix(color3, color2, alpha2), mix(color1, color0, alpha1), alphaFinal );
-   
-    outColor.a = 0.0; // yes, downstream atmospherics 
-    
+
+    outColor.a = 0.0; // yes, downstream atmospherics
+
     frag_data[0] = max(outColor, vec4(0));
     frag_data[1] = vec4(0.0,0.0,0.0,-1.0);
     vec3 nvn = normalize(vary_normal);
diff --git a/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl b/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl
index bf5d106dab..a70180c1b5 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file class1/deferred/textureUtilV.glsl
  *
  * $LicenseInfo:firstyear=2023&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2023, 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$
  */
diff --git a/indra/newview/gltf/buffer_util.h b/indra/newview/gltf/buffer_util.h
index c1101818b7..40f9448aaf 100644
--- a/indra/newview/gltf/buffer_util.h
+++ b/indra/newview/gltf/buffer_util.h
@@ -845,7 +845,7 @@ namespace LL
             arr.resize(2);
             arr[0] = src.x;
             arr[1] = src.y;
-            
+
             return true;
         }
 
diff --git a/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt b/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
index 185c0180fb..30f9349111 100644
--- a/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
+++ b/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
@@ -1,6 +1,6 @@
-The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE.

-

-This is the format required for NSIS Unicode.  See http://www.scratchpaper.com/ for details.

-

-James Cook

-September 2008

+The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE.
+
+This is the format required for NSIS Unicode.  See http://www.scratchpaper.com/ for details.
+
+James Cook
+September 2008
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 1634683d90..5623bc20cb 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterregioninfo.h
  * @author Aaron Brashears
  * @brief Declaration of the region info and controls floater and panels.
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2004&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$
  */
@@ -102,14 +102,14 @@ public:
 
     // from LLPanel
     void refresh() override;
-    
+
     void onRegionChanged();
     void requestRegionInfo();
     void enableTopButtons();
     void disableTopButtons();
 
 private:
-    
+
     LLFloaterRegionInfo(const LLSD& seed);
     ~LLFloaterRegionInfo();
 
@@ -138,31 +138,31 @@ class LLPanelRegionInfo : public LLPanel
 {
 public:
     LLPanelRegionInfo();
-    
+
     void onBtnSet();
     void onChangeChildCtrl(LLUICtrl* ctrl);
     void onChangeAnything();
     static void onChangeText(LLLineEditor* caller, void* user_data);
-    
+
     virtual bool refreshFromRegion(LLViewerRegion* region);
     virtual bool estateUpdate(LLMessageSystem* msg) { return true; }
-    
+
     bool postBuild() override;
     virtual void updateChild(LLUICtrl* child_ctrl);
-    
+
     void enableButton(const std::string& btn_name, bool enable = true);
     void disableButton(const std::string& btn_name);
-    
+
     void onClickManageTelehub();
-    
+
 protected:
     void initCtrl(const std::string& name);
     template<typename CTRL> void initAndSetCtrl(CTRL*& ctrl, const std::string& name);
-    
+
     // Returns true if update sent and apply button should be
     // disabled.
     virtual bool sendUpdate() { return true; }
-    
+
     typedef std::vector<std::string> strings_t;
     //typedef std::vector<U32> integers_t;
     void sendEstateOwnerMessage(
@@ -170,8 +170,8 @@ protected:
                      const std::string& request,
                      const LLUUID& invoice,
                      const strings_t& strings);
-    
-    
+
+
     // member data
     LLHost mHost;
 };
@@ -182,16 +182,16 @@ protected:
 
 class LLPanelRegionGeneralInfo : public LLPanelRegionInfo
 {
-    
+
 public:
     LLPanelRegionGeneralInfo()
         :   LLPanelRegionInfo() {}
     ~LLPanelRegionGeneralInfo() {}
-    
+
     bool refreshFromRegion(LLViewerRegion* region) override;
-    
+
     bool postBuild() override;
-    
+
     void onBtnSet();
     void setObjBonusFactor(F32 object_bonus_factor) {mObjBonusFactor = object_bonus_factor;}
 
@@ -219,9 +219,9 @@ public:
     ~LLPanelRegionDebugInfo() {}
 
     bool postBuild() override;
-    
+
     bool refreshFromRegion(LLViewerRegion* region) override;
-    
+
 protected:
     bool sendUpdate() override;
 
@@ -235,7 +235,7 @@ protected:
     bool callbackRestart(const LLSD& notification, const LLSD& response);
     static void onClickCancelRestart(void* data);
     static void onClickDebugConsole(void* data);
-    
+
 private:
     LLUUID mTargetAvatar;
 };
@@ -249,9 +249,9 @@ class LLPanelRegionTerrainInfo : public LLPanelRegionInfo
 public:
     LLPanelRegionTerrainInfo();
     ~LLPanelRegionTerrainInfo() {}
-    
+
     bool postBuild() override;
-    
+
     bool refreshFromRegion(LLViewerRegion* region) override;                // refresh local settings from region update from simulator
     void setEnvControls(bool available);                                    // Whether environment settings are available for this region
 
@@ -260,7 +260,7 @@ public:
     bool validateTextureHeights();
 
     //static void onChangeAnything(LLUICtrl* ctrl, void* userData);         // callback for any change, to enable commit button
-    
+
     void onSelectMaterialType();
     void updateForMaterialType();
 
@@ -296,13 +296,13 @@ class LLPanelEstateInfo : public LLPanelRegionInfo
 {
 public:
     static void initDispatch(LLDispatcher& dispatch);
-    
+
     void onChangeFixedSun();
     void onChangeUseGlobalTime();
     void onChangeAccessOverride();
-    
+
     void onClickEditSky();
-    void onClickEditSkyHelp();  
+    void onClickEditSkyHelp();
     void onClickEditDayCycle();
     void onClickEditDayCycleHelp();
 
@@ -314,26 +314,26 @@ public:
     void onKickUserCommit(const uuid_vec_t& ids);
     static void onClickMessageEstate(void* data);
     bool onMessageCommit(const LLSD& notification, const LLSD& response);
-    
+
     LLPanelEstateInfo();
     ~LLPanelEstateInfo() {}
-    
+
     void updateControls(LLViewerRegion* region);
-    
+
     static void updateEstateName(const std::string& name);
     static void updateEstateOwnerName(const std::string& name);
 
     bool refreshFromRegion(LLViewerRegion* region) override;
     bool estateUpdate(LLMessageSystem* msg) override;
-    
+
     bool postBuild() override;
     void updateChild(LLUICtrl* child_ctrl) override;
     void refresh() override;
 
     void refreshFromEstate();
-    
+
     static bool isLindenEstate();
-    
+
     const std::string getOwnerName() const;
     void setOwnerName(const std::string& name);
 
@@ -344,7 +344,7 @@ protected:
 
     void commitEstateAccess();
     void commitEstateManagers();
-    
+
     bool checkSunHourSlider(LLUICtrl* child_ctrl);
 
     U32 mEstateID;
@@ -357,7 +357,7 @@ class LLPanelEstateCovenant : public LLPanelRegionInfo
 public:
     LLPanelEstateCovenant();
     ~LLPanelEstateCovenant() {}
-    
+
     bool postBuild() override;
     void updateChild(LLUICtrl* child_ctrl) override;
     bool refreshFromRegion(LLViewerRegion* region) override;
@@ -420,7 +420,7 @@ class LLPanelRegionExperiences : public LLPanelRegionInfo
 public:
     LLPanelRegionExperiences(){}
     bool postBuild() override;
-    
+
     static bool experienceCoreConfirm(const LLSD& notification, const LLSD& response);
     static void sendEstateExperienceDelta(U32 flags, const LLUUID& agent_id);
 
@@ -482,7 +482,7 @@ private:
     void onAllowedSearchEdit(const std::string& search_string);
     void onAllowedGroupsSearchEdit(const std::string& search_string);
     void onBannedSearchEdit(const std::string& search_string);
-    
+
     // Group picker callback is different, can't use core methods below
     bool addAllowedGroup(const LLSD& notification, const LLSD& response);
     void addAllowedGroup2(LLUUID id);
diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp
index 7b4f47e567..7508956fd5 100644
--- a/indra/newview/lltinygltfhelper.cpp
+++ b/indra/newview/lltinygltfhelper.cpp
@@ -206,7 +206,7 @@ LLImageRaw * LLTinyGLTFHelper::getTexture(const std::string & folder, const tiny
 bool LLTinyGLTFHelper::loadModel(const std::string& filename, tinygltf::Model& model_in)
 {
     std::string exten = gDirUtilp->getExtension(filename);
-    
+
     if (exten == "gltf" || exten == "glb")
     {
         tinygltf::TinyGLTF loader;
@@ -243,7 +243,7 @@ bool LLTinyGLTFHelper::loadModel(const std::string& filename, tinygltf::Model& m
             LL_WARNS("GLTF") << "Cannot load. File has no materials " << filename << LL_ENDL;
             return false;
         }
-        
+
         return true;
     }
 
@@ -264,12 +264,12 @@ bool LLTinyGLTFHelper::saveModel(const std::string& filename, tinygltf::Model& m
         std::string filename_lc = filename;
         LLStringUtil::toLower(filename_lc);
 
-        
+
         bool embed_images = false;
         bool embed_buffers = false;
         bool pretty_print = true;
         bool write_binary = false;
-        
+
 
         if (std::string::npos == filename_lc.rfind(".gltf"))
         {  // file is binary