livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add "Save" button to camera floater on AnsaStorm skin

master
Ansariel 2020-07-28 11:35:33 +02:00
parent 1a5448430e
commit 6a50b3e02a
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloatercamera.cpp
View File

@ -726,7 +726,14 @@ void LLFloaterCamera::onSavePreset()
LLFloaterReg::hideInstance("delete_pref_preset", PRESETS_CAMERA);
LLFloaterReg::hideInstance("load_pref_preset", PRESETS_CAMERA);
LLFloaterReg::showInstance("save_camera_preset");
// <FS:Ansariel> Preselect correct radio button on save camera presets floater
//LLFloaterReg::showInstance("save_camera_preset");
LLSD key;
std::string current_preset = gSavedSettings.getString("PresetCameraActive");
bool is_custom_preset = current_preset != "" && !LLPresetsManager::getInstance()->isDefaultCameraPreset(current_preset);
key["index"] = is_custom_preset ? 1 : 0;
LLFloaterReg::showInstance("save_camera_preset", key);
// </FS:Ansariel>
}
void LLFloaterCamera::onCustomPresetSelected()

3
indra/newview/skins/ansastorm/xui/de/floater_camera.xml
View File

@ -53,5 +53,6 @@
<combo_box.item label="Voreinstellung verwenden" name="Use preset"/>
</combo_box>
<button name="gear_btn" tool_tip="Kamera-Voreinstellungen"/>
<button label="Kamera-Position..." name="camera_position_btn"/>
<button label="Position..." name="camera_position_btn"/>
<button label="Speichern" name="save_btn"/>
</floater>

16
indra/newview/skins/ansastorm/xui/en/floater_camera.xml
View File

@ -264,14 +264,26 @@
<button
follows="top|left"
height="23"
label="Camera Position..."
label="Position..."
layout="topleft"
left_delta="-125"
name="camera_position_btn"
top_pad="9"
width="143">
width="70">
<button.commit_callback
function="Floater.Show"
parameter="prefs_view_advanced"/>
</button>
<button
follows="top|left"
height="23"
label="Save"
layout="topleft"
left_pad="3"
name="save_btn"
top_delta="0"
width="70">
<button.commit_callback
function="CameraPresets.Save"/>
</button>
</floater>