diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-29 21:50:46 +0300 | 
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-29 22:34:38 +0300 | 
| commit | 61407e3f69dc66979a0b33f855541081efdc550c (patch) | |
| tree | 2aa04366cd38e3919d2c7e51d8dd1b5befefb5cf /indra | |
| parent | 2e837e538925056be5aa6edc3d358b1f447b5f39 (diff) | |
DRTVWR-548 resolved a merge issue
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 8 | 
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 68c4608687..bc46a61fb0 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -477,13 +477,6 @@ static bool handleRenderBumpChanged(const LLSD& newval)  	return true;  } -static bool handleRenderDebugGLChanged(const LLSD& newvalue) -{ -	gDebugGL = newvalue.asBoolean() || gDebugSession; -	gGL.clearErrors(); -	return true; -} -  static bool handleRenderDebugPipelineChanged(const LLSD& newvalue)  {  	gDebugPipeline = newvalue.asBoolean(); @@ -718,7 +711,6 @@ void settings_setup_listeners()  	setting_setup_signal_listener(gSavedSettings, "RenderMaxVBOSize", handleResetVertexBuffersChanged);      setting_setup_signal_listener(gSavedSettings, "RenderVSyncEnable", handleVSyncChanged);  	setting_setup_signal_listener(gSavedSettings, "RenderDeferredNoise", handleReleaseGLBufferChanged); -	setting_setup_signal_listener(gSavedSettings, "RenderDebugGL", handleRenderDebugGLChanged);  	setting_setup_signal_listener(gSavedSettings, "RenderDebugPipeline", handleRenderDebugPipelineChanged);  	setting_setup_signal_listener(gSavedSettings, "RenderResolutionDivisor", handleRenderResolutionDivisorChanged);  	setting_setup_signal_listener(gSavedSettings, "RenderDeferred", handleRenderDeferredChanged);  | 
