[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.15-63-gf14a84a

[Robin Cornelius]

The following commit has been merged in the master branch:
commit f14a84ac75594d99f35daad0ad1dbe052b5980b1
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Fri Aug 29 18:36:07 2008 +0100

    Buffer overrun prevension

diff --git a/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.dpatch b/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.dpatch
index 2b5a769..cc9d0c5 100644
--- a/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.dpatch
+++ b/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.dpatch
@@ -6,16 +6,28 @@
 
 @DPATCH@
 
-diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
-index 75e1fcc..9e93bd1 100644
---- a/indra/newview/llselectmgr.cpp
-+++ b/indra/newview/llselectmgr.cpp
-@@ -5303,7 +5303,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
- 		gGL.begin(LLVertexBuffer::TRIANGLES);
- 		{
- 			S32 i = 0;
--			for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++)
-+			for (S32 seg_num = 0; seg_num < ((S32)mSilhouetteSegments.size()>660?660:(S32)mSilhouetteSegments.size()); seg_num++)
- 			{
- 				S32 first_i = i;
- 				LLVector3 v;
+diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
+index e9c1227..5c1c73e 100644
+--- a/indra/llrender/llrender.cpp
++++ b/indra/llrender/llrender.cpp
+@@ -657,6 +657,9 @@ void LLRender::vertex3fv(const GLfloat* v)
+ 
+ void LLRender::texCoord2f(const GLfloat& x, const GLfloat& y)
+ { 
++	if (mCount >= 4096)
++		return;
++
+ 	mTexcoordsp[mCount] = LLVector2(x,y);
+ }
+ 
+@@ -672,6 +675,10 @@ void LLRender::texCoord2fv(const GLfloat* tc)
+ 
+ void LLRender::color4ub(const GLubyte& r, const GLubyte& g, const GLubyte& b, const GLubyte& a)
+ {
++
++	if (mCount >= 4096)
++		return;
++
+ 	mColorsp[mCount] = LLColor4U(r,g,b,a);
+ }
+ void LLRender::color4ubv(const GLubyte* c)

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids