summaryrefslogtreecommitdiff
path: root/indra/newview/llpipelinelistener.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-12-22 11:16:55 -0500
committerOz Linden <oz@lindenlab.com>2016-12-22 11:16:55 -0500
commitbe69197e0d3af1832a22c6d2475e3e1178a88a31 (patch)
treede9abd1dfc12d6da7e11e385c7dbbb53e631353a /indra/newview/llpipelinelistener.cpp
parent04c7a7a64ac40f471dcec0019a2c7235ad22bd3d (diff)
parente9f5ed6591fb5d2513b5065622b9e7dac6737913 (diff)
merge changes from project trunk
Diffstat (limited to 'indra/newview/llpipelinelistener.cpp')
-rw-r--r--indra/newview/llpipelinelistener.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpipelinelistener.cpp b/indra/newview/llpipelinelistener.cpp
index 20759239bf..dfbe689f56 100644
--- a/indra/newview/llpipelinelistener.cpp
+++ b/indra/newview/llpipelinelistener.cpp
@@ -48,7 +48,7 @@ namespace {
U32 render_type = render_type_from_string( iter->asString() );
if ( render_type != 0 )
{
- LLPipeline::toggleRenderTypeControl( (void*) render_type );
+ LLPipeline::toggleRenderTypeControl( render_type );
}
}
}
@@ -59,7 +59,7 @@ namespace {
U32 render_type = render_type_from_string( request["type"].asString() );
if ( render_type != 0 )
{
- response["value"] = LLPipeline::hasRenderTypeControl( (void*) render_type );
+ response["value"] = LLPipeline::hasRenderTypeControl( render_type );
}
else
{
@@ -87,7 +87,7 @@ namespace {
U32 render_feature = feature_from_string( iter->asString() );
if ( render_feature != 0 )
{
- LLPipeline::toggleRenderDebugControl( (void*) render_feature );
+ LLPipeline::toggleRenderDebugControl( render_feature );
}
}
}
@@ -126,7 +126,7 @@ namespace {
U32 info_display = info_display_from_string( iter->asString() );
if ( info_display != 0 )
{
- LLPipeline::toggleRenderDebug( (void*) info_display );
+ LLPipeline::toggleRenderDebug( info_display );
}
}
}