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

master
Ansariel 2024-07-26 15:16:20 +02:00
parent cf3314340b 3dc98a1292
commit 2ac43eccf3
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llwindow/llwindowsdl2.cpp
View File

@ -2691,7 +2691,8 @@ U32 LLWindowSDL::getAvailableVRAMMegabytes()
return gGLManager.mVRAM - (LLImageGL::getTextureBytesAllocated() * total_factor/mb);
*/
LL_PROFILE_ZONE_SCOPED;
if (gGLManager.mHasNVXMemInfo)
// Only use the accurate feedback if we are not using an override
if (gGLManager.mHasNVXMemInfo && gGLManager.mVRAM == gGLManager.mVRAMDetected)
{
S32 available_memory;
glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &available_memory);

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" />

4
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="Приблизить/отдалить камеру к/от точки фокусировки"/>
@ -42,4 +44,4 @@
</combo_box>
<button name="gear_btn" tool_tip="Предустановки Камеры"/>
</panel>
</floater>
</floater>

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="Приблизить/отдалить камеру к/от точки фокусировки"/>