summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-10-20 16:50:35 +0000
committerRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-10-20 16:50:35 +0000
commit0ac937200b04477994ce9c729bbda881e36288d3 (patch)
tree90c10b2234f6ce45147b89ea6cacfcb24594e341
parent10f7847c8b3e2b27776064e5743e13b90e214b21 (diff)
parenta47896f4b917340fe6e27fd0687275c38dbad401 (diff)
Merged in ruslantproductengine/viewer-neko-ruslant-4-cr (pull request #60)
MAINT-5018 crashing when touching mesh
-rw-r--r--indra/llrender/llvertexbuffer.cpp4
-rw-r--r--indra/newview/llselectmgr.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 0fae600a90..31dffdd545 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -448,7 +448,7 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
else
{
- GLenum array[] =
+ static const GLenum array[] =
{
GL_VERTEX_ARRAY,
GL_NORMAL_ARRAY,
@@ -456,7 +456,7 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
GL_COLOR_ARRAY,
};
- GLenum mask[] =
+ static const GLenum mask[] =
{
MAP_VERTEX,
MAP_NORMAL,
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 323689b788..0838c6c824 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6244,6 +6244,9 @@ void pushWireframe(LLDrawable* drawable)
void LLSelectNode::renderOneWireframe(const LLColor4& color)
{
+ //Need to because crash on ATI 3800 (and similar cards) MAINT-5018
+ LLGLDisable multisample(LLPipeline::RenderFSAASamples > 0 ? GL_MULTISAMPLE_ARB : 0);
+
LLViewerObject* objectp = getObject();
if (!objectp)
{