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

FIRE-33127: Made alphabetical sorting in "Attach to" menus optional

meow-7.2.2
Ansariel 2023-08-04 17:57:15 +02:00
parent ec2df2c84e
commit fb47a6394f
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -26394,5 +26394,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSSortAttachmentSpotsAlphabetically</key>
<map>
<key>Comment</key>
<string>Sorts the attachment spots in the "Attach to" menus alphabetically</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

7
indra/newview/llinventorybridge.cpp
View File

@ -7514,8 +7514,11 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
}
// <FS:Ansariel> FIRE-21200: Attachment Points List in Alphabetical Order
attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
if (gSavedSettings.getBOOL("FSSortAttachmentSpotsAlphabetically"))
{
attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
}
// </FS:Ansariel>
}
}

7
indra/newview/llviewerattachmenu.cpp
View File

@ -90,8 +90,11 @@ void LLViewerAttachMenu::populateMenus(const std::string& attach_to_menu_name, c
}
// <FS:Ansariel> FIRE-21200: Attachment Points List in Alphabetical Order
attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
if (gSavedSettings.getBOOL("FSSortAttachmentSpotsAlphabetically"))
{
attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
}
// </FS:Ansariel>
}

5
indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
View File

@ -136,7 +136,7 @@
<text left="370" name="text_box_objprams3">
Textur
</text>
<view_border name="TextureBorder" width="270"/>
<view_border name="TextureBorder" width="270"/>
<spinner label="X-Größe" name="X size" label_width="50" width="120"/>
<spinner label="Y-Größe" name="Y size" label_width="50" width="120"/>
<spinner label="Z-Größe" name="Z size" label_width="50" width="120"/>
@ -162,7 +162,7 @@
<combo_item name="Low" label="Niedrid"/>
<combo_item name="Medium" label="Mittel"/>
<combo_item name="High" label="Hoch"/>
</combo_box>
</combo_box>
<check_box name="FSBuildPrefs_EmbedItem" label="Objekt zu neuem Prim hinzufügen"/>
<fs_embedded_item_drop_target name="embed_item" tool_tip="Gegenstand aus Inventar hier ablegen">
Gegenstand aus Inventar hier ablegen
@ -239,6 +239,7 @@
<check_box label="Vorschau von Animation beim Upload am eigenen Avatar" tool_tip="Falls aktiviert, werden Animationen in der Vorschau am eigenen Avatar abgespielt" name="FSUploadAnimationOnOwnAvatar"/>
<check_box label="Immer erweiterte Informationen zu Animationen anzeigen" tool_tip="Erweiterte Informationen zu Animation im Eigentschaftsfenster anzeigen" name="FSAnimationPreviewExpanded"/>
<check_box label="Erweiterte Skript-Informationen aktivieren" tool_tip="Falls aktiviert, werden die Skript-Informationen um weitergehende Details ergänzt." name="FSScriptInfoExtended"/>
<check_box label="Anhänge-Punkte in „Anhängen an“-Menüs alphabetisch sortieren (Erfordert Neustart)" tool_tip="Falls aktiviert, werden die Einträge in den „Anhängen an“-Menüs alphabetisch sortiert." name="FSSortAttachmentSpotsAlphabetically"/>
</panel>
<!--Uploads-->

8
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -1646,6 +1646,14 @@
name="FSScriptInfoExtended"
enabled_control="UseLSLBridge"
control_name="FSScriptInfoExtended"/>
<check_box
top_pad="8"
follows="left|top"
height="16"
label="Sort attachment spots in &quot;Attach to&quot; menus alphabetically (requires restart)"
tool_tip="If enabled, the list of attachments spots in the &amp;Attach to&amp; menus will be sorted alphabetically"
name="FSSortAttachmentSpotsAlphabetically"
control_name="FSSortAttachmentSpotsAlphabetically"/>
</panel>
<!--Uploads-->