Merge storm-2145 dev into lindenlab branch parented from viewer-release

1 files changed, 14 insertions, 1 deletions

diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 444ad5a928..6452a41f19 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -179,6 +179,7 @@ public:
 	void buildPopupLists();
 	static void refreshSkin(void* data);
 	void selectPanel(const LLSD& name);
+	void saveCameraPreset(std::string& preset);
 	void saveGraphicsPreset(std::string& preset);
 
 private:
@@ -201,6 +202,7 @@ private:
 	std::string mDirectoryVisibility;
 	
 	LLAvatarData mAvatarProperties;
+	std::string mSavedCameraPreset;
 	std::string mSavedGraphicsPreset;
 	LOG_CLASS(LLFloaterPreference);
 };
@@ -249,6 +251,18 @@ private:
 	LOG_CLASS(LLPanelPreference);
 };
 
+class LLPanelPreferenceView : public LLPanelPreference
+{
+public:
+	BOOL postBuild();
+	void draw();
+	void setPresetText();
+
+private:
+	void onPresetsListChangeCamera();
+	LOG_CLASS(LLPanelPreferenceView);
+};
+
 class LLPanelPreferenceGraphics : public LLPanelPreference
 {
 public:
@@ -266,7 +280,6 @@ protected:
 	bool hasDirtyChilds();
 
 private:
-
 	void onPresetsListChange();
 	LOG_CLASS(LLPanelPreferenceGraphics);
 };