From 31abaa8f1a9c4b65be85771d5becba0b86d3b275 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 27 Oct 2015 11:14:33 -0400 Subject: correct merge error spotted by Ansariel --- indra/newview/llfloatermodelpreview.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llfloatermodelpreview.cpp') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 41005144a7..99d700d6a4 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3691,10 +3691,6 @@ BOOL LLModelPreview::render() if (regen) { genBuffers(mPreviewLOD, skin_weight); - { - LL_INFOS() << "Vertex Buffer[" << mPreviewLOD << "]" << " is EMPTY!!!" << LL_ENDL; - regen = TRUE; - } } if (!skin_weight) -- cgit v1.2.3 From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/newview/llfloatermodelpreview.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/newview/llfloatermodelpreview.cpp (limited to 'indra/newview/llfloatermodelpreview.cpp') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp old mode 100755 new mode 100644 -- cgit v1.2.3 From 298fa0828e0c7e233bf39b4876bdd5c42b7826d6 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 5 Apr 2016 11:25:01 +0200 Subject: Remove code duplication caused by merge with 4.0.3 --- indra/newview/llfloatermodelpreview.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llfloatermodelpreview.cpp') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index a6a9838a3c..925b59d29e 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3719,10 +3719,6 @@ BOOL LLModelPreview::render() if (regen) { genBuffers(mPreviewLOD, skin_weight); - { - LL_INFOS() << "Vertex Buffer[" << mPreviewLOD << "]" << " is EMPTY!!!" << LL_ENDL; - regen = TRUE; - } } if (!skin_weight) -- cgit v1.2.3