STORM-2082 Make code more generic to handle the future camera presets.

1 files changed, 4 insertions, 8 deletions

diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h
index 128c5850f2..3a2542bda0 100644
--- a/indra/newview/llpresetsmanager.h
+++ b/indra/newview/llpresetsmanager.h
@@ -42,13 +42,11 @@ public:
 	typedef std::list<std::string> preset_name_list_t;
 	typedef boost::signals2::signal<void()> preset_list_signal_t;
 
-	void setPresetNamesInComboBox(LLComboBox* combo);
-	void getPresetNames(preset_name_list_t& presets) const;
-	void loadPresetNamesFromDir(const std::string& dir);
-	void savePreset(const std::string & name);
+	static std::string getPresetsDir(const std::string& subdirectory);
+	void setPresetNamesInComboBox(const std::string& subdirectory, LLComboBox* combo);
+	void loadPresetNamesFromDir(const std::string& dir, preset_name_list_t& presets);
+	void savePreset(const std::string& subdirectory, const std::string & name);
 	void loadPreset(const std::string & name);
-	static std::string getCameraPresetsDir();
-	static std::string getGraphicPresetsDir();
 	bool deletePreset(const std::string& name);
 
 	/// Emitted when a preset gets loaded or deleted.
@@ -60,8 +58,6 @@ public:
 	LLPresetsManager();
 	~LLPresetsManager();
 
-	static std::string getUserDir(const std::string& subdirectory);
-
 	preset_list_signal_t mPresetListChangeSignal;
 };