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 2025-09-11 20:03:55 +02:00
parent 3a6929d53a fee26c83f4
commit 293c7ed4a3
15 changed files with 85 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewermessage.cpp
View File

@ -8518,7 +8518,10 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
<< LL_ENDL;
instance->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
if (flags & BEACON_SHOW_MAP)
// <FS:PP> FIRE-35747 Do not ignore @showworldmap=n for llMapDestination() [RLVa v2.4.2, 2025-09-11]
// if (flags & BEACON_SHOW_MAP)
if (flags & BEACON_SHOW_MAP && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP))
// </FS:PP>
{
bool old_auto_focus = instance->getAutoFocus();
instance->setAutoFocus(flags & BEACON_FOCUS_MAP);

12
indra/newview/llworld.cpp
View File

@ -1599,9 +1599,17 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
if (fsDisableNeighbourRegionConnections)
{
LLViewerRegion* current_region = gAgent.getRegion();
if (current_region && current_region->getHandle() != handle)
if (current_region)
{
return;
F32 regionSize = current_region->getWidth();
LLVector3 avPos = gAgent.getPositionAgent();
if (avPos.mV[VX] >= 0 && avPos.mV[VX] <= regionSize && avPos.mV[VY] >= 0 && avPos.mV[VY] <= regionSize)
{
if (current_region->getHandle() != handle)
{
return;
}
}
}
}
// </FS:PP>

13
indra/newview/skins/default/xui/en/panel_preferences_move.xml
View File

@ -590,13 +590,22 @@
layout="topleft"
label_width="170"
label="Avatar Rotation Turn Speed:"
top_pad="2"
top_pad="5"
max_val="100.0"
min_val="0.0"
name="av_turn_spd"
tool_tip="Alters the rate at which your avatar responds to turning. 0-100 as estimated percentage of max turn rate. 0 is default. High values will be snappy/jerky"
show_text="true"
width="320" />
<check_box
top_pad="5"
follows="left|top"
height="20"
label="Disable connecting to neighbouring regions (important: read tooltip)"
name="FSDisableNeighbourRegionConnections"
width="270"
control_name="FSDisableNeighbourRegionConnections"
tool_tip="Shows/loads only the region you are in, which can improve performance and network stability, but region crossings on foot or in vehicles will be less reliable and manual teleporting may be needed." />
<text
follows="left|top"
type="string"
@ -605,7 +614,7 @@
layout="topleft"
name="Region_Crossing_Movement_Label"
width="210"
top_pad="10">
top_pad="5">
Region crossing movement prediction:
</text>
<radio_group

1
indra/newview/skins/default/xui/pl/panel_preferences_move.xml
View File

@ -55,6 +55,7 @@
<check_box label="Awatary mogą chodzić do tyłu na Twoim ekranie (efekt jest wyłącznie lokalny)" name="FSDisableTurningAroundWhenWalkingBackwards" tool_tip="Gdy zaznaczysz tą opcję, to zezwolisz awatarom poruszającym się w tył na bycie widzianymi tak, jak gdyby się cofały - bez odwracania się. To ustawienie ma wpływ tylko na to, co pokazuje Twoja przeglądarka, a nie to, co awatar faktycznie robi. Takie ustawienie jest domyślnym dla standardowej przeglądarki Second Life. Jeśli awatar posiada AO zmuszające go do obracania się, to zachowanie to może zostać nadpisane."/>
<check_box label="Obróć awatara w kierunku zaznaczonego obiektu" name="FSTurnAvatarToSelectedObject" tool_tip="Obracaj awatara w taki sposób, aby twarz była skierowana w stronę zaznaczonego w danej chwili obiektu."/>
<slider label="Prędkość obrotu awatara:" name="av_turn_spd" tool_tip="Zmienia szybkość, z jaką Twój awatar reaguje na obracanie się. 0-100 to szacunkowy procent maksymalnej szybkości obrotu. Domyślnie: 0. Wysokie wartości będą powodować szarpanie." />
<check_box label="Wyłącz łączenie z sąsiednimi regionami (uwaga: zobacz chmurkę pomocy)" name="FSDisableNeighbourRegionConnections" tool_tip="Pokazuje/ładuje tylko region, w którym jesteś. Może to poprawić wydajność i stabilność połączenia, ale przechodzenie do innych regionów pieszo lub pojazdem będzie mniej niezawodne i może wymagać ręcznego teleportu." />
<text name="Region_Crossing_Movement_Label">
Przewiduj ruch przy zmianie regionu:
</text>

13
indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
View File

@ -269,6 +269,19 @@
preinitialize_views="false">
<folder double_click_override="true"/>
</worn_inventory_panel>
<favorites_inventory_panel
border="false"
bevel_style="none"
follows="all"
label="Favorites"
help_topic="recent_inventory_tab"
layout="topleft"
name="Favorites"
show_item_link_overlays="true"
preinitialize_views="false"
scroll.reserve_scroll_corner="false">
<folder double_click_override="true"/>
</favorites_inventory_panel>
</tab_container>
</panel>
<panel

1
indra/newview/skins/starlight/xui/ja/panel_main_inventory.xml
View File

@ -59,6 +59,7 @@
<inventory_panel label="インベントリ" name="All Items"/>
<recent_inventory_panel label="新着アイテム" name="Recent Items"/>
<worn_inventory_panel label="着用中" name="Worn Items"/>
<favorites_inventory_panel label="お気に入り" name="Favorites"/>
</tab_container>
</panel>
<panel name="bottom_panel">

1
indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml
View File

@ -56,6 +56,7 @@
<inventory_panel label="庫存" name="All Items"/>
<recent_inventory_panel label="最近" name="Recent Items" />
<worn_inventory_panel label="裝扮" name="Worn Items" />
<favorites_inventory_panel label="收藏" name="Favorites"/>
</tab_container>
</panel>
<panel name="bottom_panel">

40
indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml
View File

@ -259,19 +259,33 @@
scroll.reserve_scroll_corner="false">
<folder double_click_override="true"/>
</recent_inventory_panel>
<worn_inventory_panel
bevel_style="none"
follows="all"
height="338"
label="Worn"
help_topic="worn_inventory_tab"
layout="topleft"
left_delta="0"
name="Worn Items"
show_item_link_overlays="true"
width="290" >
<folder double_click_override="true"/>
</worn_inventory_panel>
<worn_inventory_panel
bevel_style="none"
follows="all"
height="338"
label="Worn"
help_topic="worn_inventory_tab"
layout="topleft"
left_delta="0"
name="Worn Items"
show_item_link_overlays="true"
width="290" >
<folder double_click_override="true"/>
</worn_inventory_panel>
<favorites_inventory_panel
border="false"
bevel_style="none"
follows="all"
height="338"
label="Favorites"
help_topic="recent_inventory_tab"
layout="topleft"
name="Favorites"
show_item_link_overlays="true"
preinitialize_views="false"
scroll.reserve_scroll_corner="false">
<folder double_click_override="true"/>
</favorites_inventory_panel>
</tab_container>
</panel>
<panel

1
indra/newview/skins/starlightcui/xui/ja/panel_main_inventory.xml
View File

@ -59,6 +59,7 @@
<inventory_panel label="インベントリ" name="All Items"/>
<recent_inventory_panel label="新着アイテム" name="Recent Items"/>
<worn_inventory_panel label="着用中" name="Worn Items"/>
<favorites_inventory_panel label="お気に入り" name="Favorites"/>
</tab_container>
</panel>
<panel name="bottom_panel">

1
indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml
View File

@ -56,6 +56,7 @@
<inventory_panel label="庫存" name="All Items"/>
<recent_inventory_panel label="最近" name="Recent Items" />
<worn_inventory_panel label="裝扮" name="Worn Items" />
<favorites_inventory_panel label="收藏" name="Favorites"/>
</tab_container>
</panel>
<panel name="bottom_panel">

1
indra/newview/skins/vintage/xui/de/panel_main_inventory.xml
View File

@ -114,6 +114,7 @@
<inventory_panel label="Alle Objekte" name="All Items" width="288" />
<recent_inventory_panel label="Letzte Objekte" name="Recent Items" width="290" />
<worn_inventory_panel label="Angezogene Objekte" name="Worn Items" width="290" />
<favorites_inventory_panel label="Favoriten" name="Favorites" width="290" />
</tab_container>
</panel>
<text name="ItemcountText" tool_tip="[ITEMS] Objekte, [CATEGORIES] Ordner">

11
indra/newview/skins/vintage/xui/en/panel_main_inventory.xml
View File

@ -866,6 +866,17 @@
show_item_link_overlays="true" >
<folder double_click_override="true"/>
</worn_inventory_panel>
<favorites_inventory_panel
border="false"
bevel_style="in"
follows="all"
label="Favorites"
help_topic="recent_inventory_tab"
layout="topleft"
name="Favorites"
show_item_link_overlays="true">
<folder double_click_override="true"/>
</favorites_inventory_panel>
</tab_container>
</panel>

1
indra/newview/skins/vintage/xui/ja/panel_main_inventory.xml
View File

@ -112,6 +112,7 @@
<inventory_panel label="インベントリ" name="All Items"/>
<recent_inventory_panel label="新着アイテム" name="Recent Items"/>
<worn_inventory_panel label="着用中" name="Worn Items"/>
<favorites_inventory_panel label="お気に入り" name="Favorites"/>
</tab_container>
</panel>
<text tool_tip="[ITEMS]個のアイテム、[CATEGORIES]個のフォルダがあります。" name="ItemcountText">

1
indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml
View File

@ -127,6 +127,7 @@
<inventory_panel label="Wszystkie" name="All Items"/>
<recent_inventory_panel label="Ostatnie" name="Recent Items"/>
<worn_inventory_panel label="Założone" name="Worn Items"/>
<favorites_inventory_panel label="Ulubione" name="Favorites" />
</tab_container>
</panel>
<text name="ItemcountText" tool_tip="[ITEMS] przedmiotów, [CATEGORIES] folderów">

1
indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml
View File

@ -128,6 +128,7 @@
<inventory_panel label="庫存" name="All Items" />
<recent_inventory_panel label="最近" name="Recent Items" />
<worn_inventory_panel label="裝扮" name="Worn Items" />
<favorites_inventory_panel label="收藏" name="Favorites"/>
</tab_container>
</panel>
<text name="ItemcountText" tool_tip="物件 [ITEMS]，檔案夾 [CATEGORIES]">