diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-08 15:18:48 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-08 15:18:48 -0700 |
| commit | b082ed28e8936fa378160be3076393f295c26c1b (patch) | |
| tree | 6dfd40478bbcf0a03e4be12d3d17c73ad161d7d2 /indra/newview/llviewercontrol.cpp | |
| parent | d038ed07f0978aa9f43e488bd525987d20543d1c (diff) | |
| parent | 5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (diff) | |
Pulled merge from Vir's Bento.
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
| -rwxr-xr-x | indra/newview/llviewercontrol.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 5020518454..466edb19b2 100755 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -761,6 +761,7 @@ void settings_setup_listeners() gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&handleSpellCheckChanged)); gSavedSettings.getControl("SpellCheckDictionary")->getSignal()->connect(boost::bind(&handleSpellCheckChanged)); gSavedSettings.getControl("LoginLocation")->getSignal()->connect(boost::bind(&handleLoginLocationChanged)); + gSavedSettings.getControl("MaxJointsPerMeshObject")->getCommitSignal()->connect(boost::bind(&handleSetShaderChanged, _2)); } #if TEST_CACHED_CONTROL |