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

Merge branch 'FirestormViewer:master' into FIRE-34968

meow-7.2.2
Angeldark Raymaker 2025-01-07 19:16:42 +00:00 committed by GitHub
parent 7b1fcf8c84 819bdd72ea
commit c21f98df1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/llviewermenu.cpp
View File

@ -2255,8 +2255,8 @@ class LLAdvancedToggleShowLookAt : public view_listener_t
//<FS:AO improve use of controls with radiogroups>
//bool value = !gSavedPerAccountSettings.getBOOL("DebugLookAt");
//gSavedPerAccountSettings.setBOOL("DebugLookAt",value);
S32 value = !gSavedPerAccountSettings.getS32("DebugLookAt");
gSavedPerAccountSettings.setS32("DebugLookAt",value);
S32 value = gSavedPerAccountSettings.getS32("DebugLookAt") == 0 ? 1 : 0;
gSavedPerAccountSettings.setS32("DebugLookAt", value);
//</FS:AO>
return true;
}
@ -2265,21 +2265,21 @@ class LLAdvancedToggleShowLookAt : public view_listener_t
// <AO>
class LLAdvancedToggleShowColor : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
S32 value = !gSavedSettings.getS32("DebugShowColor");
gSavedSettings.setS32("DebugShowColor",value);
return true;
}
bool handleEvent(const LLSD& userdata)
{
S32 value = gSavedSettings.getS32("DebugShowColor") == 0 ? 1 : 0;
gSavedSettings.setS32("DebugShowColor", value);
return true;
}
};
class LLAdvancedCheckShowColor : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
S32 new_value = gSavedSettings.getS32("DebugShowColor");
return (bool)new_value;
}
bool handleEvent(const LLSD& userdata)
{
bool new_value = gSavedSettings.getS32("DebugShowColor") != 0;
return new_value;
}
};
// </AO>
@ -2290,7 +2290,7 @@ class LLAdvancedCheckShowLookAt : public view_listener_t
//bool new_value = LLHUDEffectLookAt::sDebugLookAt;
//<FS:AO improve use of controls with radiogroups>
//bool new_value = gSavedPerAccountSettings.getBOOL("DebugLookAt");
S32 new_value = gSavedPerAccountSettings.getS32("DebugLookAt");
bool new_value = gSavedPerAccountSettings.getS32("DebugLookAt") > 0;
return (bool)new_value;
}
};

2
indra/newview/skins/default/xui/pl/panel_snapshot_inventory.xml
View File

@ -7,6 +7,8 @@
<combo_box.item label="Mała (128x128)" name="Small(128x128)" />
<combo_box.item label="Średnia (256x256)" name="Medium(256x256)" />
<combo_box.item label="Duża (512x512)" name="Large(512x512)" />
<combo_box.item label="Bardzo duża (1024x1024)" name="Very Large(1024x1024)" />
<combo_box.item label="Ogromna (2048x2048)" name="Huge(2048x2048)" />
<combo_box.item label="Obecne okno" name="CurrentWindow" />
<combo_box.item label="Własna" name="Custom" />
</combo_box>

12
indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
View File

@ -3,18 +3,24 @@
<text name="title">
Инвентарь
</text>
<text name="hint_lbl">
Сохранение изображения в инвентаре стоит L$[UPLOAD_COST]. Чтобы сохранить его как текстуру, выберите один из квадратных форматов.
</text>
<combo_box label="Размер" name="texture_size_combo">
<combo_box.item label="Текущее окно" name="CurrentWindow"/>
<combo_box.item label="Маленький (128x128)" name="Small(128x128)"/>
<combo_box.item label="Средний (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Большой (512x512)" name="Large(512x512)"/>
<combo_box.item label="Очень большой (1024x1024)" name="Very Large(1024x1024)"/>
<combo_box.item label="Огромный (2048x2048)" name="Huge(2048x2048)"/>
<combo_box.item label="Текущее окно" name="CurrentWindow"/>
<combo_box.item label="Задать" name="Custom"/>
</combo_box>
<spinner label="Ширина Высота" name="inventory_snapshot_width"/>
<check_box label="Сохранять пропорции" name="inventory_keep_aspect_check"/>
<check_box label="Temp upload" name="inventory_temp_upload"/>
<text name="hint_lbl">
Чтобы сохранить ваше изображение как текстуру, выберите один из квадратных форматов.
Стоимость загрузки L$[UPLOAD_COST].
</text>
<button label="&#x25B6; Выбор" name="cancel_btn"/>
<button label="Сохранить" name="save_btn"/>
</panel>

4
indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
View File

@ -7,6 +7,8 @@
<combo_box.item label="小（128x128）" name="Small(128x128)" />
<combo_box.item label="中（256x256）" name="Medium(256x256)" />
<combo_box.item label="大（512x512）" name="Large(512x512)" />
<combo_box.item label="非常大 (1024x1024)" name="Very Large(1024x1024)"/>
<combo_box.item label="巨大 (2048x2048)" name="Huge(2048x2048)"/>
<combo_box.item label="當前視窗" name="CurrentWindow" />
<combo_box.item label="自訂" name="Custom" />
</combo_box>
@ -18,6 +20,6 @@
上傳費用: [UPLOAD_COST]L$
</text>
<button label="▶ 取消" name="cancel_btn" />
<button label="&#x25B6; 取消" name="cancel_btn" />
<button label="儲存" name="save_btn" />
</panel>