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

Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 

# Conflicts:
#	indra/llwindow/llwindowsdl2.cpp
master
Ansariel 2024-07-30 10:37:17 +02:00
parent 4eab7c2b1c 73788b2c67
commit 0b9ac4ee19
10 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -23,4 +23,4 @@ Build instructions for each operating system can be found using the links below
## Contribute
Help make Firestorm better! You can get involved with improvements by filing bugs and suggesting enhancements via [JIRA](https://jira.firestormviewer.org) or [creating pull requests](FS_PR_GUIDELINES.md).
Help make Firestorm better! You can get involved with improvements by filing bugs and suggesting enhancements via [JIRA](https://jira.firestormviewer.org) or [creating pull requests](doc/FS_PR_GUIDELINES.md).

0
FS_PR_GUIDELINES.md → doc/FS_PR_GUIDELINES.md
View File

5
indra/newview/llpanelface.cpp
View File

@ -603,8 +603,6 @@ LLPanelFace::LLPanelFace()
mTitleMediaText(NULL),
mNeedMediaTitle(true)
{
buildFromFile("panel_tools_texture.xml"); // <FS:Zi> switchable edit texture/materials
USE_TEXTURE = LLTrans::getString("use_texture");
// <FS> Extended copy & paste buttons
//mCommitCallbackRegistrar.add("PanelFace.menuDoToSelected", boost::bind(&LLPanelFace::menuDoToSelected, this, _2));
@ -612,8 +610,11 @@ LLPanelFace::LLPanelFace()
// </FS>
// <FS:Zi> Find all faces with same texture
mCommitCallbackRegistrar.add("BuildTool.Flip", boost::bind(&LLPanelFace::onCommitFlip, _1, _2));
mCommitCallbackRegistrar.add("BuildTool.SelectSameTexture", boost::bind(&LLPanelFace::onClickBtnSelectSameTexture, this, _1, _2));
// </FS:Zi>
buildFromFile("panel_tools_texture.xml"); // <FS:Zi> switchable edit texture/materials
}
LLPanelFace::~LLPanelFace()

2
indra/newview/llviewertexturelist.cpp
View File

@ -950,13 +950,13 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
if (face && face->getViewerObject() && face->getTextureEntry())
{
F32 vsize = face->getPixelArea();
// <FS:Beq> Fix Blurry textures and use importance weight
F32 radius;
F32 cos_angle_to_view_dir;
bool in_frustum = face->calcPixelArea(cos_angle_to_view_dir, radius);
static LLCachedControl<F32> bias_unimportant_threshold(gSavedSettings, "TextureBiasUnimportantFactor", 0.25f);
// </FS:Beq>
F32 vsize = face->getPixelArea();
// Scale desired texture resolution higher or lower depending on texture scale
//

2
indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
View File

@ -70,7 +70,7 @@
<combo_box.item label="Alle Avatare und Objekte" name="3"/>
<combo_box.item label="Alles" name="4"/>
</combo_box>
<text name="local lights_label" tool_tip="Beeinflusst die Anzahl an dargestellten Lichtquellen, wenn Erweitertes Beleuchtungsmodell aktiviert ist (Neustart erforderlich).">
<text name="local lights_label" tool_tip="Beeinflusst die Anzahl an dargestellten Lichtquellen (Neustart erforderlich).">
Punkt. Beleucht. (Neustart erf.):
</text>
<combo_box name="LocalLightsDetail">

2
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
View File

@ -421,7 +421,7 @@
layout="topleft"
left_delta="-5"
name="local lights_label"
tool_tip="Affects the number of rendered light sources when Advanced Lighting Model is disabled. A restart is required to change mode.">
tool_tip="Affects the number of rendered. A restart is required to change mode.">
Point Lighting (restart required)
</text>
<combo_box

2
indra/newview/skins/default/xui/fr/floater_camera.xml
View File

@ -17,6 +17,8 @@
<layout_stack name="camera_view_layout_stack">
<layout_panel name="camera_rotate_layout_panel">
<joystick_rotate name="cam_rotate_stick" tool_tip="Faire tourner la caméra autour du point central"/>
<button name="roll_left" tool_tip="Faire pivoter la caméra vers la gauche"/>
<button name="roll_right" tool_tip="Faire pivoter la caméra vers la droite"/>
</layout_panel>
<layout_panel name="camera_zoom_layout_panel">
<slider_bar name="zoom_slider" tool_tip="Zoomer en direction du point central"/>

2
indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml
View File

@ -13,6 +13,8 @@
<layout_stack name="camera_view_layout_stack">
<layout_panel name="camera_rotate_layout_panel">
<joystick_rotate name="cam_rotate_stick" tool_tip="Faites pivoter la caméra autour du sujet" />
<button name="roll_left" tool_tip="Faire pivoter la caméra vers la gauche"/>
<button name="roll_right" tool_tip="Faire pivoter la caméra vers la droite"/>
</layout_panel>
<layout_panel name="camera_zoom_layout_panel">
<slider_bar name="zoom_slider" tool_tip="Zoomez sur le sujet" />

2
indra/newview/skins/default/xui/ru/floater_camera.xml
View File

@ -25,6 +25,8 @@
<layout_stack name="camera_view_layout_stack">
<layout_panel name="camera_rotate_layout_panel">
<joystick_rotate name="cam_rotate_stick" tool_tip="Вращение камеры вокруг точки фокусировки"/>
<button name="roll_left" tool_tip="Вращать камеру влево"/>
<button name="roll_right" tool_tip="Вращать камеру вправо"/>
</layout_panel>
<layout_panel name="camera_zoom_layout_panel">
<slider_bar name="zoom_slider" tool_tip="Приблизить/отдалить камеру к/от точки фокусировки"/>

2
indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml
View File

@ -13,6 +13,8 @@
<layout_stack name="camera_view_layout_stack">
<layout_panel name="camera_rotate_layout_panel">
<joystick_rotate name="cam_rotate_stick" tool_tip="Вращение камеры вокруг точки фокусировки"/>
<button name="roll_left" tool_tip="Вращать камеру влево"/>
<button name="roll_right" tool_tip="Вращать камеру вправо"/>
</layout_panel>
<layout_panel name="camera_zoom_layout_panel">
<slider_bar name="zoom_slider" tool_tip="Приблизить/отдалить камеру к/от точки фокусировки"/>