diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-14 11:19:33 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-14 11:19:33 -0800 |
| commit | 1d022e86c84039f88c531e91ce857666acd224a1 (patch) | |
| tree | 9a8ba45529cb125a2ae5cd4672b3fd093af9b45c /indra/newview/llpipelinelistener.cpp | |
| parent | 18eb4b497fd890118e7da78dcc2eda4bd84c4ede (diff) | |
| parent | 34770cbf2ef34b7901552057a0823e502d42be1d (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpipelinelistener.cpp')
| -rw-r--r-- | indra/newview/llpipelinelistener.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpipelinelistener.cpp b/indra/newview/llpipelinelistener.cpp index dfbe689f56..f11cdcf876 100644 --- a/indra/newview/llpipelinelistener.cpp +++ b/indra/newview/llpipelinelistener.cpp @@ -87,7 +87,7 @@ namespace { U32 render_feature = feature_from_string( iter->asString() ); if ( render_feature != 0 ) { - LLPipeline::toggleRenderDebugControl( render_feature ); + LLPipeline::toggleRenderDebugFeatureControl( render_feature ); } } } @@ -123,7 +123,7 @@ namespace { iter != request["displays"].endArray(); ++iter) { - U32 info_display = info_display_from_string( iter->asString() ); + U64 info_display = info_display_from_string( iter->asString() ); if ( info_display != 0 ) { LLPipeline::toggleRenderDebug( info_display ); @@ -134,7 +134,7 @@ namespace { void has_info_display_wrapper(LLSD const& request) { LLEventAPI::Response response(LLSD(), request); - U32 info_display = info_display_from_string( request["display"].asString() ); + U64 info_display = info_display_from_string( request["display"].asString() ); if ( info_display != 0 ) { response["value"] = gPipeline.hasRenderDebugMask(info_display); |