SL-12186 WIP Use appropriate offset names when saving presets

5 files changed, 64 insertions, 33 deletions

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 3e56c1dd71..882e3cee55 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1948,11 +1948,21 @@ std::string LLAgentCamera::getCameraOffsetCtrlName()
 	return mCameraOffsetInitial[mCameraPreset]->getName();
 }
 
+std::string LLAgentCamera::getCameraOffsetCtrlName(ECameraPreset preset)
+{
+	return mCameraOffsetInitial[preset]->getName();
+}
+
 std::string LLAgentCamera::getFocusOffsetCtrlName()
 {
 	return mFocusOffsetInitial[mCameraPreset]->getName();
 }
 
+std::string LLAgentCamera::getFocusOffsetCtrlName(ECameraPreset preset)
+{
+	return mFocusOffsetInitial[preset]->getName();
+}
+
 F32 LLAgentCamera::getCameraMaxZoomDistance()
 {
     // Ignore "DisableCameraConstraints", we don't want to be out of draw range when we focus onto objects or avatars
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h
index 294e81c2e1..5c8172bbfc 100644
--- a/indra/newview/llagentcamera.h
+++ b/indra/newview/llagentcamera.h
@@ -118,7 +118,9 @@ public:
 	LLVector3d getFocusOffsetInitial();
 
 	std::string getCameraOffsetCtrlName();
+	std::string getCameraOffsetCtrlName(ECameraPreset preset);
 	std::string getFocusOffsetCtrlName();
+	std::string getFocusOffsetCtrlName(ECameraPreset preset);
 private:
 	/** Determines maximum camera distance from target for mouselook, opposite to LAND_MIN_ZOOM */
 	F32 getCameraMaxZoomDistance();
diff --git a/indra/newview/llpanelpresetscamerapulldown.cpp b/indra/newview/llpanelpresetscamerapulldown.cpp
index 7612c428d9..1ac105e1c8 100644
--- a/indra/newview/llpanelpresetscamerapulldown.cpp
+++ b/indra/newview/llpanelpresetscamerapulldown.cpp
@@ -52,7 +52,7 @@ LLPanelPresetsCameraPulldown::LLPanelPresetsCameraPulldown()
 {
 	mHoverTimer.stop();
 
-	mCommitCallbackRegistrar.add("Presets.GoViewPrefs", boost::bind(&LLPanelPresetsCameraPulldown::onViewButtonClick, this, _2));
+	mCommitCallbackRegistrar.add("Presets.toggleCameraFloater", boost::bind(&LLPanelPresetsCameraPulldown::onViewButtonClick, this, _2));
 	mCommitCallbackRegistrar.add("PresetsCamera.RowClick", boost::bind(&LLPanelPresetsCameraPulldown::onRowClick, this, _2));
 
 	buildFromFile( "panel_presets_camera_pulldown.xml");
@@ -205,19 +205,7 @@ void LLPanelPresetsCameraPulldown::onViewButtonClick(const LLSD& user_data)
 	// close the minicontrol, we're bringing up the big one
 	setVisible(FALSE);
 
-	// bring up the prefs floater
-	LLFloater* prefsfloater = LLFloaterReg::showInstance("preferences");
-	if (prefsfloater)
-	{
-		// grab the 'view' panel from the preferences floater and
-		// bring it the front!
-		LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
-		LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("view");
-		if (tabcontainer && graphicspanel)
-		{
-			tabcontainer->selectTabPanel(graphicspanel);
-		}
-	}
+	LLFloaterReg::toggleInstanceOrBringToFront("camera");
 }
 
 //virtual
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 057f60a015..71f0cd72d4 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -275,6 +275,9 @@ void LLPresetsManager::getOffsetControlNames(std::vector<std::string>& names)
 
 bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string name, bool createDefault)
 {
+	bool IS_CAMERA = (PRESETS_CAMERA == subdirectory);
+	bool IS_GRAPHIC = (PRESETS_GRAPHIC == subdirectory);
+
 	if (LLTrans::getString(PRESETS_DEFAULT) == name)
 	{
 		name = PRESETS_DEFAULT;
@@ -294,7 +297,7 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
 	bool saved = false;
 	std::vector<std::string> name_list;
 
-	if(PRESETS_GRAPHIC == subdirectory)
+	if (IS_GRAPHIC)
 	{
 		LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
 		if (instance && !createDefault)
@@ -309,11 +312,13 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
 			LL_WARNS("Presets") << "preferences floater instance not found" << LL_ENDL;
 		}
 	}
-	else if(PRESETS_CAMERA == subdirectory)
+	else if (IS_CAMERA)
 	{
 		name_list.clear();
 		getControlNames(name_list);
 		name_list.push_back("PresetCameraActive");
+		name_list.push_back(gAgentCamera.getCameraOffsetCtrlName());
+		name_list.push_back(gAgentCamera.getFocusOffsetCtrlName());
 	}
 	else
 	{
@@ -324,7 +329,7 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
 	LLSD paramsData(LLSD::emptyMap());
 
 	// Create a default graphics preset from hw recommended settings 
-	if (createDefault && name == PRESETS_DEFAULT && subdirectory == PRESETS_GRAPHIC)
+	if (IS_GRAPHIC && createDefault && name == PRESETS_DEFAULT)
 	{
 		paramsData = LLFeatureManager::getInstance()->getRecommendedSettingsMap();
 		if (gSavedSettings.getU32("RenderAvatarMaxComplexity") == 0)
@@ -335,25 +340,47 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
 	}
 	else
 	{
-		bool custom_camera_offsets = false;
-		if (subdirectory == PRESETS_CAMERA)
+		ECameraPreset new_camera_preset = (ECameraPreset)gSavedSettings.getU32("CameraPreset");
+		bool new_camera_offsets = false;
+		if (IS_CAMERA)
 		{
-			name_list.push_back(gAgentCamera.getCameraOffsetCtrlName());
-			name_list.push_back(gAgentCamera.getFocusOffsetCtrlName());
-			custom_camera_offsets = !isDefaultCameraPreset(name);
+			if (isDefaultCameraPreset(name))
+			{
+				if (PRESETS_REAR_VIEW == name)
+				{
+					new_camera_preset = CAMERA_PRESET_REAR_VIEW;
+				}
+				else if (PRESETS_SIDE_VIEW == name)
+				{
+					new_camera_preset = CAMERA_PRESET_GROUP_VIEW;
+				}
+				else if (PRESETS_FRONT_VIEW == name)
+				{
+					new_camera_preset = CAMERA_PRESET_FRONT_VIEW;
+				}
+			}
+			else 
+			{
+				new_camera_preset = CAMERA_PRESET_CUSTOM;
+			}
+			new_camera_offsets = (!isDefaultCameraPreset(name) || (ECameraPreset)gSavedSettings.getU32("CameraPreset") != new_camera_preset);
 		}
 		for (std::vector<std::string>::iterator it = name_list.begin(); it != name_list.end(); ++it)
 		{
 			std::string ctrl_name = *it;
 			std::string dest_ctrl_name = ctrl_name;
-			if (custom_camera_offsets && ctrl_name == gAgentCamera.getCameraOffsetCtrlName())
-			{
-				dest_ctrl_name = "CameraOffsetCustomPreset";
-			}
-			if (custom_camera_offsets && ctrl_name == gAgentCamera.getFocusOffsetCtrlName())
+			if (IS_CAMERA && new_camera_offsets)
 			{
-				dest_ctrl_name = "FocusOffsetCustomPreset";
+				if (ctrl_name == gAgentCamera.getCameraOffsetCtrlName())
+				{
+					dest_ctrl_name = gAgentCamera.getCameraOffsetCtrlName(new_camera_preset);
+				}
+				if (ctrl_name == gAgentCamera.getFocusOffsetCtrlName())
+				{
+					dest_ctrl_name = gAgentCamera.getFocusOffsetCtrlName(new_camera_preset);
+				}
 			}
+
 			LLControlVariable* ctrl = gSavedSettings.getControl(ctrl_name).get();
 			if (ctrl)
 			{
@@ -367,6 +394,10 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
 				paramsData[dest_ctrl_name]["Value"] = value;
 			}
 		}
+		if (IS_CAMERA)
+		{
+			gSavedSettings.setU32("CameraPreset", new_camera_preset);
+		}
 	}
 
 	std::string pathName(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml");
@@ -385,14 +416,14 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
             
 			LL_DEBUGS() << "saved preset '" << name << "'; " << paramsData.size() << " parameters" << LL_ENDL;
 
-			if (subdirectory == PRESETS_GRAPHIC)
+			if (IS_GRAPHIC)
 			{
 				gSavedSettings.setString("PresetGraphicActive", name);
 				// signal interested parties
 				triggerChangeSignal();
 			}
 
-			if (subdirectory == PRESETS_CAMERA)
+			if (IS_CAMERA)
 			{
 				gSavedSettings.setString("PresetCameraActive", name);
 				setCameraDirty(false);
diff --git a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
index dc37270751..25d9c47449 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
@@ -57,13 +57,13 @@
     width="215" />
   <button
     name="open_prefs_btn"
-    label="Open View Preferences"
-    tool_tip = "Bring up view preferences"
+    label="Open Camera floater"
+    tool_tip = "Bring up Camera floater"
     top_delta="5"
     left="15"
     height="20"
     width="200">
     <button.commit_callback
-      function="Presets.GoViewPrefs" />
+      function="Presets.toggleCameraFloater" />
   </button>
 </panel>