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

Merge branch 'FirestormViewer:master' into FIRE-34884

master
Angeldark Raymaker 2025-01-10 22:04:51 +00:00 committed by GitHub
parent 9a4e6c982d ea2956baaf
commit 4b0a14490a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llpanelcontents.cpp
View File

@ -177,6 +177,14 @@ void LLPanelContents::getState(LLViewerObject *objectp )
void LLPanelContents::onFilterEdit()
{
const std::string& filter_substring = mFilterEditor->getText();
// <FS:Beq> FIRE-35010 Bugsplat crash with filter while loading contents
auto root_folder = mPanelInventoryObject->getRootFolder();
if (!root_folder)
{
mPanelInventoryObject->getFilter().setFilterSubString(filter_substring);
return;
}
// </FS:Beq>
if (filter_substring.empty())
{
if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
@ -186,12 +194,12 @@ void LLPanelContents::onFilterEdit()
}
mSavedFolderState.setApply(true);
mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
root_folder->applyFunctorRecursively(mSavedFolderState); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
// Add a folder with the current item to the list of previously opened folders
LLOpenFoldersWithSelection opener;
mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(opener);
mPanelInventoryObject->getRootFolder()->scrollToShowSelection();
root_folder->applyFunctorRecursively(opener); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
root_folder->scrollToShowSelection(); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
}
else if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
{
@ -199,7 +207,7 @@ void LLPanelContents::onFilterEdit()
if (!mPanelInventoryObject->getFilter().isNotDefault())
{
mSavedFolderState.setApply(false);
mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
root_folder->applyFunctorRecursively(mSavedFolderState); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
}
}

6
indra/newview/lltoolcomp.cpp
View File

@ -344,7 +344,7 @@ bool LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its properties
LLFloaterReg::showInstance("build", "Content");
LLFloaterReg::showInstance("build", "Contents");
return true;
}
// Nothing selected means the first mouse click was probably
@ -463,7 +463,7 @@ bool LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its properties
LLFloaterReg::showInstance("build", "Content");
LLFloaterReg::showInstance("build", "Contents");
return true;
}
else
@ -674,7 +674,7 @@ bool LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its properties
LLFloaterReg::showInstance("build", "Content");
LLFloaterReg::showInstance("build", "Contents");
return true;
}
else

2
indra/newview/lltooldraganddrop.cpp
View File

@ -1887,7 +1887,7 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
if (LLFloaterReg::instanceVisible("build"))
{
// *FIX: only show this if panel not expanded?
LLFloaterReg::showInstance("build", "Content");
LLFloaterReg::showInstance("build", "Contents");
}
// VEFFECT: AddToInventory

2
indra/newview/lltoolindividual.cpp
View File

@ -88,7 +88,7 @@ bool LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its inventory.
LLFloaterReg::showInstance("build", "Content");
LLFloaterReg::showInstance("build", "Contents");
return true;
}
else

18
indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
View File

@ -1,18 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">Inventaire</text>
<text name="title">
Inventaire
</text>
<combo_box label="Résolution" name="texture_size_combo">
<combo_box.item label="Petite (128x128)" name="Small(128x128)"/>
<combo_box.item label="Moyenne (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Large (512x512)" name="Large(512x512)"/>
<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
<combo_box.item label="Très grande (1024x1024)" name="Very Large(1024x1024)"/>
<combo_box.item label="Énorme (2048x2048)" name="Huge(2048x2048)"/>
<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
<combo_box.item label="Personnalisée" name="Custom"/>
</combo_box>
<spinner label="Largeur x Hauteur" label_width="100" width="150" name="inventory_snapshot_width"/>
<spinner width="50" name="inventory_snapshot_height"/>
<check_box label="Conserver les proportions" name="inventory_keep_aspect_check"/>
<check_box label="Uploader temporairement" name="inventory_temp_upload"/>
<text name="hint_lbl">L&apos;enregistrement d&apos;une image dans l&apos;inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image en tant que texture, sélectionnez un des formats listés.</text>
<check_box label="Temporaire" name="inventory_temp_upload"/>
<text name="hint_lbl">
Pour enregistrer votre image en tant que texture, sélectionnez l'un des formats carrés.
Coût du téléversement : [UPLOAD_COST] L$
</text>
<button label="&#x25B6; Sélection" name="cancel_btn"/>
<button label="Enregistrer" name="save_btn"/>
</panel>
</panel>