Merge branch 'main' into 2025.06

1 files changed, 8 insertions, 9 deletions

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index a90ff73578..a147cb4657 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -1661,12 +1661,12 @@ void renderOctree(LLSpatialGroup* group)
 
             gGL.diffuseColor4f(1,0,0,group->mBuilt);
             gGL.flush();
-            glLineWidth(5.f);
+            //glLineWidth(5.f);
 
             const LLVector4a* bounds = group->getObjectBounds();
             drawBoxOutline(bounds[0], bounds[1]);
-            gGL.flush();
-            glLineWidth(1.f);
+            //gGL.flush();
+            //glLineWidth(1.f);
             gGL.flush();
 
             const LLVOAvatar* lastAvatar = nullptr;
@@ -1978,12 +1978,11 @@ void renderBoundingBox(LLDrawable* drawable, bool set_color = true)
     if (vobj && vobj->onActiveList())
     {
         gGL.flush();
-        glLineWidth(llmax(4.f*sinf(gFrameTimeSeconds*2.f)+1.f, 1.f));
-        //glLineWidth(4.f*(sinf(gFrameTimeSeconds*2.f)*0.25f+0.75f));
-        stop_glerror();
+        //glLineWidth(llmax(4.f*sinf(gFrameTimeSeconds*2.f)+1.f, 1.f));
+         stop_glerror();
         drawBoxOutline(pos,size);
         gGL.flush();
-        glLineWidth(1.f);
+        //glLineWidth(1.f);
     }
     else
     {
@@ -2897,7 +2896,7 @@ public:
             if (i == 1)
             {
                 gGL.flush();
-                glLineWidth(3.f);
+                //glLineWidth(3.f);
             }
 
             gGL.begin(LLRender::TRIANGLES);
@@ -2916,7 +2915,7 @@ public:
             if (i == 1)
             {
                 gGL.flush();
-                glLineWidth(1.f);
+                //glLineWidth(1.f);
             }
         }
     }