diff options
author | Jacek Antonelli | 2010-02-09 21:11:42 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-16 18:50:15 -0600 |
commit | e6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch) | |
tree | 10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/newview/llviewercontrol.cpp | |
parent | Ported some cURL and HTTP-related changes from Snowglobe. (diff) | |
download | meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2 meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz |
Ported many texture engine changes from Snowglobe.
Diffstat (limited to 'linden/indra/newview/llviewercontrol.cpp')
-rw-r--r-- | linden/indra/newview/llviewercontrol.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp index 08e9d45..6d62db5 100644 --- a/linden/indra/newview/llviewercontrol.cpp +++ b/linden/indra/newview/llviewercontrol.cpp | |||
@@ -91,6 +91,8 @@ std::string gCurrentVersion; | |||
91 | extern BOOL gResizeScreenTexture; | 91 | extern BOOL gResizeScreenTexture; |
92 | extern BOOL gDebugGL; | 92 | extern BOOL gDebugGL; |
93 | 93 | ||
94 | extern BOOL gAuditTexture; | ||
95 | |||
94 | //////////////////////////////////////////////////////////////////////////// | 96 | //////////////////////////////////////////////////////////////////////////// |
95 | // Listeners | 97 | // Listeners |
96 | 98 | ||
@@ -374,6 +376,12 @@ static bool handleRenderUseImpostorsChanged(const LLSD& newvalue) | |||
374 | return true; | 376 | return true; |
375 | } | 377 | } |
376 | 378 | ||
379 | static bool handleAuditTextureChanged(const LLSD& newvalue) | ||
380 | { | ||
381 | gAuditTexture = newvalue.asBoolean(); | ||
382 | return true; | ||
383 | } | ||
384 | |||
377 | static bool handleRenderDebugGLChanged(const LLSD& newvalue) | 385 | static bool handleRenderDebugGLChanged(const LLSD& newvalue) |
378 | { | 386 | { |
379 | gDebugGL = newvalue.asBoolean(); | 387 | gDebugGL = newvalue.asBoolean(); |
@@ -527,6 +535,7 @@ void settings_setup_listeners() | |||
527 | gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); | 535 | gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); |
528 | gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); | 536 | gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); |
529 | gSavedSettings.getControl("AudioStreamingMusic")->getSignal()->connect(boost::bind(&handleAudioStreamMusicChanged, _1)); | 537 | gSavedSettings.getControl("AudioStreamingMusic")->getSignal()->connect(boost::bind(&handleAudioStreamMusicChanged, _1)); |
538 | gSavedSettings.getControl("AuditTexture")->getSignal()->connect(boost::bind(&handleAuditTextureChanged, _1)); | ||
530 | gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); | 539 | gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); |
531 | gSavedSettings.getControl("MuteMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); | 540 | gSavedSettings.getControl("MuteMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); |
532 | gSavedSettings.getControl("MuteMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); | 541 | gSavedSettings.getControl("MuteMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1)); |