summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterpreference.cpp4
-rw-r--r--indra/newview/llpanelpresetscamerapulldown.cpp3
-rw-r--r--indra/newview/llpresetsmanager.cpp6
3 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index df21bec0bc..0a717cc834 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2643,11 +2643,7 @@ void LLPanelPreferenceView::setPresetText()
{
if (presetsMgr->isCameraDirty() && !preset_camera_active.empty())
{
- gSavedSettings.setString("PresetCameraActive", "");
preset_camera_active.clear();
- // This doesn't seem to cause an infinite recursion. This trigger is needed to cause the pulldown
- // panel to update.
- LLPresetsManager::getInstance()->triggerChangeCameraSignal();
}
}
diff --git a/indra/newview/llpanelpresetscamerapulldown.cpp b/indra/newview/llpanelpresetscamerapulldown.cpp
index ffdfc445ce..e2b9c080fb 100644
--- a/indra/newview/llpanelpresetscamerapulldown.cpp
+++ b/indra/newview/llpanelpresetscamerapulldown.cpp
@@ -63,11 +63,12 @@ BOOL LLPanelPresetsCameraPulldown::postBuild()
LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
if (presetsMgr)
{
- presetsMgr->setPresetListChangeCameraCallback(boost::bind(&LLPanelPresetsCameraPulldown::populatePanel, this));
// Make sure there is a default preference file
presetsMgr->createMissingDefault(PRESETS_CAMERA);
presetsMgr->startWatching(PRESETS_CAMERA);
+
+ presetsMgr->setPresetListChangeCameraCallback(boost::bind(&LLPanelPresetsCameraPulldown::populatePanel, this));
}
populatePanel();
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index d4535c69c8..7368615365 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -208,6 +208,12 @@ bool LLPresetsManager::isCameraDirty()
void LLPresetsManager::settingChanged()
{
setCameraDirty(true);
+
+ gSavedSettings.setString("PresetCameraActive", "");
+
+// Hack call because this is a static routine
+ LLPresetsManager::getInstance()->triggerChangeCameraSignal();
+
}
void LLPresetsManager::getControlNames(std::vector<std::string>& names)