summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-19 10:32:38 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-19 10:32:38 -0500
commite60d95acf14bcf98c86a4694e9a56433cf074182 (patch)
tree599f2026692d3f0d3ec198dd53fe7ac218974acf
parent60a9c8d7abe102cefeb72666b9645a6dd34e84b8 (diff)
parentc0fffdea8812e5eed8da9f341d3bfc9590301ada (diff)
merge
-rwxr-xr-xindra/cmake/GooglePerfTools.cmake2
-rw-r--r--indra/llui/llview.cpp2
-rw-r--r--indra/newview/llappviewerwin32.cpp2
-rw-r--r--indra/newview/llface.cpp3
4 files changed, 5 insertions, 4 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 09501e0406..73b3642ae6 100755
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -3,7 +3,7 @@ include(Prebuilt)
# If you want to enable or disable TCMALLOC in viewer builds, this is the place.
# set ON or OFF as desired.
-set (USE_TCMALLOC ON)
+set (USE_TCMALLOC OFF)
if (STANDALONE)
include(FindGooglePerfTools)
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 542f57ee5f..7abe4ecd9f 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -283,7 +283,7 @@ void LLView::moveChildToBackOfTabGroup(LLUICtrl* child)
bool LLView::addChild(LLView* child, S32 tab_group)
{
// NOTE: Changed this to not crash in release mode
- llassert(mInDraw == false);
+ //llassert(mInDraw == false);
if (!child)
{
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 647ace7ee3..8087453ee5 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -117,7 +117,7 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
// This results in a 2-3x improvement in opening a new Inventory window (which uses a large numebr of allocations)
// Note: This won't work when running from the debugger unless the _NO_DEBUG_HEAP environment variable is set to 1
- _CrtSetDbgFlag(0); // default, just making explicit
+ _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); // default, just making explicit
ULONG ulEnableLFH = 2;
HANDLE* hHeaps = new HANDLE[MAX_HEAPS];
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 6dbeae6677..f60f311b9e 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1377,7 +1377,8 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
{
if (!do_xform)
{
- LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, num_vertices*2*sizeof(F32));
+ S32 tc_size = (num_vertices*2*sizeof(F32)+0xF) & ~0xF;
+ LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, tc_size);
}
else
{