aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewercontrol.cpp')
-rw-r--r--linden/indra/newview/llviewercontrol.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index b9db346..08e9d45 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -71,6 +71,8 @@
71#include "llvowlsky.h" 71#include "llvowlsky.h"
72#include "llrender.h" 72#include "llrender.h"
73#include "llmediamanager.h" 73#include "llmediamanager.h"
74#include "llslider.h"
75
74 76
75#ifdef TOGGLE_HACKED_GODLIKE_VIEWER 77#ifdef TOGGLE_HACKED_GODLIKE_VIEWER
76BOOL gHackGodmode = FALSE; 78BOOL gHackGodmode = FALSE;
@@ -462,6 +464,12 @@ bool handleMediaDebugLevelChanged(const LLSD& newvalue)
462 return true; 464 return true;
463} 465}
464 466
467bool handleSliderScrollWheelMultiplierChanged(const LLSD& newvalue)
468{
469 LLSlider::setScrollWheelMultiplier( newvalue.asInteger() );
470 return true;
471}
472
465//////////////////////////////////////////////////////////////////////////// 473////////////////////////////////////////////////////////////////////////////
466 474
467void settings_setup_listeners() 475void settings_setup_listeners()
@@ -592,6 +600,7 @@ void settings_setup_listeners()
592 gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); 600 gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
593 gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); 601 gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
594 gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1)); 602 gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));
603 gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));
595 604
596// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h 605// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
597 if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING)) 606 if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))