summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt4
-rw-r--r--indra/newview/llfloaterloadprefpreset.cpp3
-rw-r--r--indra/newview/llfloaterpreference.cpp10
-rw-r--r--indra/newview/llfloaterpreferenceviewadvanced.cpp (renamed from indra/newview/llfloaterpreferencemoveadvanced.cpp)28
-rw-r--r--indra/newview/llfloaterpreferenceviewadvanced.h (renamed from indra/newview/llfloaterpreferencemoveadvanced.h)14
-rw-r--r--indra/newview/llfloatersaveprefpreset.cpp3
-rw-r--r--indra/newview/llviewerfloaterreg.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_load_pref_preset.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml (renamed from indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml)4
-rw-r--r--indra/newview/skins/default/xui/en/floater_save_pref_preset.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_move.xml2
12 files changed, 43 insertions, 35 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7de4e85316..291f32e8b0 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -277,7 +277,7 @@ set(viewer_SOURCE_FILES
llfloaterperms.cpp
llfloaterpostprocess.cpp
llfloaterpreference.cpp
- llfloaterpreferencemoveadvanced.cpp
+ llfloaterpreferenceviewadvanced.cpp
llfloaterpreviewtrash.cpp
llfloaterproperties.cpp
llfloaterregiondebugconsole.cpp
@@ -902,7 +902,7 @@ set(viewer_HEADER_FILES
llfloaterperms.h
llfloaterpostprocess.h
llfloaterpreference.h
- llfloaterpreferencemoveadvanced.h
+ llfloaterpreferenceviewadvanced.h
llfloaterpreviewtrash.h
llfloaterproperties.h
llfloaterregiondebugconsole.h
diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp
index 403db35cc0..fa17a9d40e 100644
--- a/indra/newview/llfloaterloadprefpreset.cpp
+++ b/indra/newview/llfloaterloadprefpreset.cpp
@@ -42,7 +42,8 @@ LLFloaterLoadPrefPreset::LLFloaterLoadPrefPreset(const LLSD &key)
// virtual
BOOL LLFloaterLoadPrefPreset::postBuild()
-{ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+{
+ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
if (preferences)
{
preferences->addDependentFloater(this);
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 872e961a70..df21bec0bc 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -790,12 +790,12 @@ void LLFloaterPreference::onOpen(const LLSD& key)
LLButton* delete_btn = findChild<LLButton>("PrefDeleteButton");
LLButton* exceptions_btn = findChild<LLButton>("RenderExceptionsButton");
- if (load_btn && save_btn && delete_btn)
+ if (load_btn && save_btn && delete_btn && exceptions_btn)
{
load_btn->setEnabled(started);
save_btn->setEnabled(started);
delete_btn->setEnabled(started);
- exceptions_btn->setEnabled(started);
+ exceptions_btn->setEnabled(started);
}
LLButton* load_camera_btn = findChild<LLButton>("PrefCameraLoadButton");
@@ -2519,18 +2519,24 @@ void LLPanelPreference::updateMediaAutoPlayCheckbox(LLUICtrl* ctrl)
void LLPanelPreference::deletePreset(const LLSD& user_data)
{
std::string subdirectory = user_data.asString();
+ LLFloaterReg::hideInstance("load_pref_preset", subdirectory);
+ LLFloaterReg::hideInstance("save_pref_preset", subdirectory);
LLFloaterReg::showInstance("delete_pref_preset", subdirectory);
}
void LLPanelPreference::savePreset(const LLSD& user_data)
{
std::string subdirectory = user_data.asString();
+ LLFloaterReg::hideInstance("delete_pref_preset", subdirectory);
+ LLFloaterReg::hideInstance("load_pref_preset", subdirectory);
LLFloaterReg::showInstance("save_pref_preset", subdirectory);
}
void LLPanelPreference::loadPreset(const LLSD& user_data)
{
std::string subdirectory = user_data.asString();
+ LLFloaterReg::hideInstance("delete_pref_preset", subdirectory);
+ LLFloaterReg::hideInstance("save_pref_preset", subdirectory);
LLFloaterReg::showInstance("load_pref_preset", subdirectory);
}
diff --git a/indra/newview/llfloaterpreferencemoveadvanced.cpp b/indra/newview/llfloaterpreferenceviewadvanced.cpp
index 3ff19147b1..ff80328acc 100644
--- a/indra/newview/llfloaterpreferencemoveadvanced.cpp
+++ b/indra/newview/llfloaterpreferenceviewadvanced.cpp
@@ -1,5 +1,5 @@
/**
- * @file llfloaterpreferencemoveadvanced.cpp
+ * @file llfloaterpreferenceviewadvanced.cpp
* @brief floater for adjusting camera position
*
* $LicenseInfo:firstyear=2018&license=viewerlgpl$
@@ -25,7 +25,7 @@
*/
#include "llviewerprecompiledheaders.h"
-#include "llfloaterpreferencemoveadvanced.h"
+#include "llfloaterpreferenceviewadvanced.h"
#include "llfloater.h"
#include "llfloaterreg.h"
#include "lluictrlfactory.h"
@@ -33,24 +33,24 @@
#include "llviewercontrol.h"
-LLFloaterPreferenceMoveAdvanced::LLFloaterPreferenceMoveAdvanced(const LLSD& key)
+LLFloaterPreferenceViewAdvanced::LLFloaterPreferenceViewAdvanced(const LLSD& key)
: LLFloater(key)
{
- mCommitCallbackRegistrar.add("Cancel", boost::bind(&LLFloaterPreferenceMoveAdvanced::onClickCancel, this));
- mCommitCallbackRegistrar.add("CommitSettings", boost::bind(&LLFloaterPreferenceMoveAdvanced::onCommitSettings, this));
- mCommitCallbackRegistrar.add("Ok", boost::bind(&LLFloaterPreferenceMoveAdvanced::onClickOk, this));
+ mCommitCallbackRegistrar.add("Cancel", boost::bind(&LLFloaterPreferenceViewAdvanced::onClickCancel, this));
+ mCommitCallbackRegistrar.add("CommitSettings", boost::bind(&LLFloaterPreferenceViewAdvanced::onCommitSettings, this));
+ mCommitCallbackRegistrar.add("Ok", boost::bind(&LLFloaterPreferenceViewAdvanced::onClickOk, this));
}
-LLFloaterPreferenceMoveAdvanced::~LLFloaterPreferenceMoveAdvanced()
+LLFloaterPreferenceViewAdvanced::~LLFloaterPreferenceViewAdvanced()
{}
-void LLFloaterPreferenceMoveAdvanced::onClickOk()
+void LLFloaterPreferenceViewAdvanced::onClickOk()
{
closeFloater();
}
-void LLFloaterPreferenceMoveAdvanced::onClickCancel()
+void LLFloaterPreferenceViewAdvanced::onClickCancel()
{
gSavedSettings.setVector3("CameraOffsetRearView", mCameraSaved);
gSavedSettings.setVector3d("FocusOffsetRearView", mFocusSaved);
@@ -59,7 +59,7 @@ void LLFloaterPreferenceMoveAdvanced::onClickCancel()
updateFocusControl(mFocusSaved);
}
-BOOL LLFloaterPreferenceMoveAdvanced::postBuild()
+BOOL LLFloaterPreferenceViewAdvanced::postBuild()
{
mCameraSaved = gSavedSettings.getVector3("CameraOffsetRearView");
mFocusSaved = gSavedSettings.getVector3d("FocusOffsetRearView");
@@ -70,7 +70,7 @@ BOOL LLFloaterPreferenceMoveAdvanced::postBuild()
return TRUE;
}
-void LLFloaterPreferenceMoveAdvanced::updateCameraControl(LLVector3 vector)
+void LLFloaterPreferenceViewAdvanced::updateCameraControl(LLVector3 vector)
{
LLSpinCtrl* spinnerx = getChild<LLSpinCtrl>("camera_x");
LLSpinCtrl* spinnery = getChild<LLSpinCtrl>("camera_y");
@@ -99,7 +99,7 @@ void LLFloaterPreferenceMoveAdvanced::updateCameraControl(LLVector3 vector)
}
}
-void LLFloaterPreferenceMoveAdvanced::updateFocusControl(LLVector3d vector3d)
+void LLFloaterPreferenceViewAdvanced::updateFocusControl(LLVector3d vector3d)
{
LLSpinCtrl* spinnerx = getChild<LLSpinCtrl>("focus_x");
LLSpinCtrl* spinnery = getChild<LLSpinCtrl>("focus_y");
@@ -128,13 +128,13 @@ void LLFloaterPreferenceMoveAdvanced::updateFocusControl(LLVector3d vector3d)
}
}
- void LLFloaterPreferenceMoveAdvanced::draw()
+ void LLFloaterPreferenceViewAdvanced::draw()
{
// updateControl();
LLFloater::draw();
}
-void LLFloaterPreferenceMoveAdvanced::onCommitSettings()
+void LLFloaterPreferenceViewAdvanced::onCommitSettings()
{
LLVector3 vector;
LLVector3d vector3d;
diff --git a/indra/newview/llfloaterpreferencemoveadvanced.h b/indra/newview/llfloaterpreferenceviewadvanced.h
index 98648af19e..5b63770059 100644
--- a/indra/newview/llfloaterpreferencemoveadvanced.h
+++ b/indra/newview/llfloaterpreferenceviewadvanced.h
@@ -1,5 +1,5 @@
/**
- * @file llfloaterpreferencemoveadvanced.h
+ * @file llfloaterpreferenceviewadvanced.h
* @brief floater for adjusting camera position
*
* $LicenseInfo:firstyear=2018&license=viewerlgpl$
@@ -24,19 +24,19 @@
* $/LicenseInfo$
*/
-#ifndef LLFLOATERPREFERENCEMOVEADVANCED_H
-#define LLFLOATERPREFERENCEMOVEADVANCED_H
+#ifndef LLFLOATERPREFERENCEVIEWADVANCED_H
+#define LLFLOATERPREFERENCEVIEWADVANCED_H
#include "llcontrol.h"
#include "llfloater.h"
-class LLFloaterPreferenceMoveAdvanced
+class LLFloaterPreferenceViewAdvanced
: public LLFloater
{
friend class LLFloaterReg;
public:
- LLFloaterPreferenceMoveAdvanced(const LLSD& key);
+ LLFloaterPreferenceViewAdvanced(const LLSD& key);
virtual BOOL postBuild();
virtual void draw();
@@ -47,12 +47,12 @@ public:
void updateFocusControl(LLVector3d vector3d);
private:
- virtual ~LLFloaterPreferenceMoveAdvanced();
+ virtual ~LLFloaterPreferenceViewAdvanced();
LLVector3 mCameraSaved;
LLVector3d mFocusSaved;
};
-#endif //LLFLOATERPREFERENCEMOVEADVANCED_H
+#endif //LLFLOATERPREFERENCEVIEWADVANCED_H
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp
index bdef718d0e..eaacba893d 100644
--- a/indra/newview/llfloatersaveprefpreset.cpp
+++ b/indra/newview/llfloatersaveprefpreset.cpp
@@ -42,7 +42,8 @@ LLFloaterSavePrefPreset::LLFloaterSavePrefPreset(const LLSD &key)
// virtual
BOOL LLFloaterSavePrefPreset::postBuild()
-{ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+{
+ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
if (preferences)
{
preferences->addDependentFloater(this);
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 440bf46b1e..5237986cd6 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -104,7 +104,7 @@
#include "llfloaterperms.h"
#include "llfloaterpostprocess.h"
#include "llfloaterpreference.h"
-#include "llfloaterpreferencemoveadvanced.h"
+#include "llfloaterpreferenceviewadvanced.h"
#include "llfloaterpreviewtrash.h"
#include "llfloaterproperties.h"
#include "llfloaterregiondebugconsole.h"
@@ -296,7 +296,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
LLFloaterReg::add("prefs_graphics_advanced", "floater_preferences_graphics_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceGraphicsAdvanced>);
- LLFloaterReg::add("prefs_move_advanced", "floater_preferences_move_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceMoveAdvanced>);
+ LLFloaterReg::add("prefs_view_advanced", "floater_preferences_view_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceViewAdvanced>);
LLFloaterReg::add("prefs_proxy", "floater_preferences_proxy.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceProxy>);
LLFloaterReg::add("prefs_spellchecker_import", "floater_spellcheck_import.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSpellCheckerImport>);
LLFloaterReg::add("prefs_translation", "floater_translation_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTranslationSettings>);
diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
index 0688fdb42c..3360d7bec9 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
@@ -4,7 +4,7 @@
height="130"
help_topic="floater_delete_preset"
layout="topleft"
- name="Delete Pref Preset"
+ name="delete_pref_preset"
save_rect="true"
title="DELETE PREF PRESET"
width="300">
diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
index 5f2eb770e2..49c21f1ea7 100644
--- a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -4,7 +4,7 @@
height="130"
help_topic="floater_load_preset"
layout="topleft"
- name="Load Pref Preset"
+ name="load_pref_preset"
save_rect="true"
title="LOAD PREF PRESET"
width="300">
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
index 28e5d2c607..5b2cbee914 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -2,8 +2,8 @@
<floater
height="170"
layout="topleft"
- name="floaterpreferencesmoveadvanced"
- help_topic="floatermoveadvanced"
+ name="floaterpreferencesviewadvanced"
+ help_topic="floaterviewadvanced"
title="ADJUST CAMERA VIEW"
save_rect="true"
width="280">
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 7dee28eff3..a9cda26f0b 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -4,7 +4,7 @@
height="145"
help_topic="floater_save_preset"
layout="topleft"
- name="Save Pref Preset"
+ name="save_pref_preset"
save_rect="true"
title="SAVE PREF PRESET"
width="300">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index d832dac4ff..8d8441695f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -138,7 +138,7 @@
width="115">
<button.commit_callback
function="Floater.Show"
- parameter="prefs_move_advanced" />
+ parameter="prefs_view_advanced" />
</button>
<button
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 01:19:06 +0000