summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-10-21 16:47:03 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-10-21 16:47:03 -0400
commitd365aa10f16c022970cefbfac8651fe01b5a9de8 (patch)
tree0549a07f81aada34f098ec66ce3397602efa6ee8 /indra/newview/llviewercontrol.cpp
parentbfa3f83a2cf5d4ca408e7f045cd806a7f5133d9f (diff)
SL-234 WIP - moved LLSkinningUtil funcs to separate class/files. Remap weights where needed. Warn that related debug settings require restart to take effect.
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rwxr-xr-xindra/newview/llviewercontrol.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 466edb19b2..4e4aaf5f8e 100755
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -67,6 +67,7 @@
#include "llvowlsky.h"
#include "llrender.h"
#include "llnavigationbar.h"
+#include "llnotificationsutil.h"
#include "llfloatertools.h"
#include "llpaneloutfitsinventory.h"
#include "llpanellogin.h"
@@ -119,6 +120,12 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
}
+static bool handleDeferredDebugSettingChanged(const LLSD& newvalue)
+{
+ LLNotificationsUtil::add("ChangeDeferredDebugSetting");
+ return true;
+}
+
static bool handleSetShaderChanged(const LLSD& newvalue)
{
// changing shader level may invalidate existing cached bump maps, as the shader type determines the format of the bump map it expects - clear and repopulate the bump cache
@@ -761,7 +768,8 @@ 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));
+ gSavedSettings.getControl("MaxJointsPerMeshObject")->getCommitSignal()->connect(boost::bind(&handleDeferredDebugSettingChanged, _2));
+ gSavedSettings.getControl("IncludeEnhancedSkeleton")->getCommitSignal()->connect(boost::bind(&handleDeferredDebugSettingChanged, _2));
}
#if TEST_CACHED_CONTROL