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

Added option to show "Received Items" folder as regular folder in inventory

Ansariel 2012-03-21 22:04:57 +01:00
parent 1c2674d552
commit b70ffbfd7a
5 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17126,6 +17126,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<real>20</real>
</map>
<key>FSShowInboxFolder</key>
<map>
<key>Comment</key>
<string>If enabled, the Received Items folder aka Inbox is shown in the inventory as folder.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

28
indra/newview/llinventorypanel.cpp
View File

@ -238,7 +238,14 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
}
// hide inbox
getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
// <FS:Ansariel> Optional hiding of Received Items folder aka Inbox
//getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
if (!gSavedSettings.getBOOL("FSShowInboxFolder"))
{
getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
}
gSavedSettings.getControl("FSShowInboxFolder")->getSignal()->connect(boost::bind(&LLInventoryPanel::updateHideInboxFolder, this, _2));
// </FS:Ansariel> Optional hiding of Received Items folder aka Inbox
getFilter()->setFilterCategoryTypes(getFilter()->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_OUTBOX));
// set the filter for the empty folder if the debug setting is on
@ -1177,6 +1184,25 @@ void LLInventoryPanel::updateHideEmptySystemFolders(const LLSD &data)
}
// </FS:Ansariel> Optional hiding of empty system folders
// <FS:Ansariel> Optional hiding of Inbox folder
void LLInventoryPanel::updateHideInboxFolder(const LLSD &data)
{
LLInventoryFilter* filter = getFilter();
if (filter)
{
if (data.asBoolean())
{
filter->setFilterCategoryTypes(filter->getFilterCategoryTypes() | (1ULL << LLFolderType::FT_INBOX));
}
else
{
filter->setFilterCategoryTypes(filter->getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
}
filter->setModified(LLInventoryFilter::FILTER_RESTART);
}
}
// </FS:Ansariel> Optional hiding of Inbox folder
// DEBUG ONLY
// static
void LLInventoryPanel::dumpSelectionInformation(void* user_data)

4
indra/newview/llinventorypanel.h
View File

@ -174,7 +174,9 @@ public:
// <FS:Ansariel> Optional hiding of empty system folders
void updateHideEmptySystemFolders(const LLSD &data);
// <FS:Ansariel> Optional hiding of Inbox folder
void updateHideInboxFolder(const LLSD &data);
// DEBUG ONLY:
static void dumpSelectionInformation(void* user_data);

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

@ -18,6 +18,7 @@
<check_box label="Kontaktliste immer nach Benutzername sortieren" name="sortcontactsbyun" tool_tip="Sortiert Kontaktlisten immer anhand des Benutzernamens, auch wenn Anzeigenamen aktiviert sind."/>
<check_box label="Blockierte Avatar als Partikelwolke darstellen" name="ShowMutedAvatarsAsCloud" tool_tip="Blockierte Avatare werden als Partikelwolke in einer speziellen Farbe dargestellt."/>
<check_box label="Leere Systemordner im Inventar verstecken" name="DebugHideEmptySystemFolders" tool_tip="Versteckt leere Systemordner wie z.B. Favoriten oder Landmarken usw. in den Inventarfenstern."/>
<check_box label="Ordner &quot;Received Items&quot; im Inventar anzeigen" name="FSShowInboxFolder" tool_tip="Falls aktiviert wird der Ordner &quot;Received Items&quot; als normaler Ordner im Inventar angezeigt."/>
<check_box name="UseLSLBridge" label="LSL-Client-Brücke aktivieren" tool_tip="Erlaub dem Viewer die Nutzung eines geskripteten Objektes (Brücke), um weitergehende Funktionen anzubieten."/>
<check_box name="UseLSLFlightAssist" label="Flug-Assistent der Brücke aktivieren" tool_tip="Aktiviert ein Skript, dass Fliegen und Schweben in größeren Höhen ermöglicht."/>
</panel>

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

@ -156,6 +156,18 @@
tool_tip="If enabled, the inventory windows will hide all empty system folders like Favorites, Landmarks etc.">
</check_box>
<check_box
top_pad="5"
follows="left|top"
height="16"
label="Show the Received Items folder in normal inventory"
left="15"
name="FSShowInboxFolder"
width="270"
control_name="FSShowInboxFolder"
tool_tip="If enabled, the inventory windows will also show the Received Items folder">
</check_box>
<check_box
top_pad="15"
control_name="UseLSLBridge"