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

FIRE-22538: Add button to reset default upload folders

meow-7.2.2
Ansariel 2018-05-04 18:41:46 +02:00
parent 9b4f330386
commit 1d80eda28e
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/fspanelprefs.cpp
View File

@ -67,6 +67,8 @@ BOOL FSPanelPrefs::postBuild()
getChild<LLUICtrl>("refresh_beams")->setCommitCallback(boost::bind(&FSPanelPrefs::refreshBeamLists, this));
getChild<LLUICtrl>("delete_beam")->setCommitCallback(boost::bind(&FSPanelPrefs::onBeamDelete, this));
getChild<LLUICtrl>("reset_default_folders")->setCommitCallback(boost::bind(&FSPanelPrefs::onResetDefaultFolders, this));
populateCloudCombo();
LLTextureCtrl* tex_ctrl = getChild<LLTextureCtrl>("texture control");
@ -102,11 +104,13 @@ void FSPanelPrefs::onOpen(const LLSD& key)
getChild<LLTextBox>("build_item_add_disp_rect_txt")->setTextArg("[ITEM]", getString("EmbeddedItemNotAvailable"));
}
}
getChild<LLUICtrl>("reset_default_folders")->setEnabled(TRUE);
}
else
{
getChild<LLCheckBoxCtrl>("FSBuildPrefs_EmbedItem")->setEnabled(FALSE);
getChild<LLTextBox>("build_item_add_disp_rect_txt")->setTextArg("[ITEM]", getString("EmbeddedItemNotLoggedIn"));
getChild<LLUICtrl>("reset_default_folders")->setEnabled(FALSE);
}
}
@ -299,3 +303,10 @@ void FSPanelPrefs::onDADEmbeddedItem(const LLUUID& item_id)
}
}
void FSPanelPrefs::onResetDefaultFolders()
{
gSavedPerAccountSettings.getControl("ModelUploadFolder")->resetToDefault(true);
gSavedPerAccountSettings.getControl("TextureUploadFolder")->resetToDefault(true);
gSavedPerAccountSettings.getControl("SoundUploadFolder")->resetToDefault(true);
gSavedPerAccountSettings.getControl("AnimationUploadFolder")->resetToDefault(true);
}

2
indra/newview/fspanelprefs.h
View File

@ -58,6 +58,8 @@ private:
void onDADEmbeddedItem(const LLUUID& item_id);
void onResetDefaultFolders();
FSEmbeddedItemDropTarget* mInvDropTarget;
std::string mEmbeddedItem;
};

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

@ -273,6 +273,7 @@
Um einen Zielordner zu ändern, im Inventar auf den gewünschten Ordner rechts-klicken und
„Als Standard nutzen für“ auswählen.
</text>
<button name="reset_default_folders" label="Standard-Ordner zurücksetzen"/>
</panel>
</tab_container>
</panel>

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

@ -1816,6 +1816,13 @@
To change a destination folder, right click on it in inventory and choose
"Use as default for"
</text>
<button
name="reset_default_folders"
label="Reset default folders"
left="10"
top_pad="10"
width="200"
follows="left|top" />
</panel>
</tab_container>
</panel>