Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/gltf/asset.h b/indra/newview/gltf/asset.h
index 5a62313705..74f4b246a5 100644
--- a/indra/newview/gltf/asset.h
+++ b/indra/newview/gltf/asset.h
@@ -33,7 +33,7 @@
 #include "primitive.h"
 #include "animation.h"
 
-extern F32SecondsImplicit		gFrameTimeSeconds;
+extern F32SecondsImplicit       gFrameTimeSeconds;
 
 // LL GLTF Implementation
 namespace LL
@@ -100,7 +100,7 @@ namespace LL
 
 
             const Material& operator=(const tinygltf::Material& src);
-            
+
             void allocateGLResources(Asset& asset);
         };
 
@@ -112,7 +112,7 @@ namespace LL
             std::string mName;
 
             const Mesh& operator=(const tinygltf::Mesh& src);
-            
+
             void allocateGLResources(Asset& asset);
         };
 
@@ -133,7 +133,7 @@ namespace LL
 
             // if true, translation/rotation/scale are valid and up to date
             bool mTRSValid = false;
-            
+
             bool mNeedsApplyMatrix = false;
 
             std::vector<S32> mChildren;
@@ -194,7 +194,7 @@ namespace LL
             std::string mName;
 
             const Scene& operator=(const tinygltf::Scene& src);
-            
+
             void updateTransforms(Asset& asset);
             void updateRenderTransforms(Asset& asset, const LLMatrix4a& modelview);
         };
@@ -295,7 +295,7 @@ namespace LL
 
             // prepare the asset for rendering
             void allocateGLResources(const std::string& filename, const tinygltf::Model& model);
-            
+
             // Called periodically (typically once per frame)
             // Any ongoing work (such as animations) should be handled here
             // NOT guaranteed to be called every frame
@@ -308,7 +308,7 @@ namespace LL
 
             // update node render transforms
             void updateRenderTransforms(const LLMatrix4a& modelview);
-            
+
             void render(bool opaque, bool rigged = false);
             void renderOpaque();
             void renderTransparent();
@@ -322,7 +322,7 @@ namespace LL
                 LLVector4a* tangent = nullptr,             // return the surface tangent at the intersection point
                 S32* primitive_hitp = nullptr           // return the index of the primitive that was hit
             );
-            
+
             const Asset& operator=(const tinygltf::Model& src);
 
             // save the asset to a tinygltf model