summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2014-12-03 09:38:10 -0500
committerJonathan Yap <jhwelch@gmail.com>2014-12-03 09:38:10 -0500
commitafd12a6e784574e69ef3b3e7cac14573fe7c3197 (patch)
treebbd9dbac307a7f0419361ae74156bd74e29a3981 /indra/newview
parentcc22efa4c0d6b06bac6f49b6243df7726f89c7c4 (diff)
STORM-2082 Send signal to pulldown panel to refresh itself
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelpresetspulldown.cpp2
-rw-r--r--indra/newview/llpresetsmanager.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
index cd049712e1..093b5caad9 100644
--- a/indra/newview/llpanelpresetspulldown.cpp
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -150,8 +150,6 @@ void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)
instance->refreshEnabledGraphics();
}
setVisible(FALSE);
- // This line shouldn't be necessary but it is.
- populatePanel();
}
}
}
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index ddcd54162c..260f2c9547 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -242,6 +242,9 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, const std::st
std::string full_path(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml");
gSavedSettings.loadFromFile(full_path, false, true);
+
+ // signal interested parties
+ mPresetListChangeSignal();
}
bool LLPresetsManager::deletePreset(const std::string& subdirectory, const std::string& name)