summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-16 16:01:32 -0400
committerOz Linden <oz@lindenlab.com>2013-04-16 16:01:32 -0400
commit327c99cadbcbe15442eaee8e0625ade17dcda61f (patch)
tree6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/newview/llappviewerwin32.cpp
parente20099155378fd10f7997e36ae8ef150c8c5ad91 (diff)
parentfac6ee27f2d3277494f011271064b0e5e7e02554 (diff)
merge up to 3.5.2 development
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r--indra/newview/llappviewerwin32.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 786ceb453c..0ba3669487 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -92,7 +92,7 @@ void nvapi_error(NvAPI_Status status)
llwarns << szDesc << llendl;
//should always trigger when asserts are enabled
- llassert(status == NVAPI_OK);
+ //llassert(status == NVAPI_OK);
}
// Create app mutex creates a unique global windows object.