Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Negative TeleportHistoryMaxEntries means unlimited now

Browse Source
This commit is contained in:
Lirusaito
2019-06-10 09:15:35 -04:00
parent c2f56f1881
commit 82386fe2ef
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloaterteleporthistory.cpp
View File

@@ -157,7 +157,12 @@ void LLFloaterTeleportHistory::addEntry(std::string parcelName)
// add the new list entry on top of the list, deselect all and disable the buttons // add the new list entry on top of the list, deselect all and disable the buttons
const S32 max_entries = gSavedSettings.getS32("TeleportHistoryMaxEntries"); const S32 max_entries = gSavedSettings.getS32("TeleportHistoryMaxEntries");
S32 num_entries = mPlacesList->getItemCount(); S32 num_entries = mPlacesList->getItemCount();
while(num_entries >= max_entries) if (max_entries <= 0)
{
if (!max_entries)
mPlaces->clearRows();
}
else while(num_entries >= max_entries)
{ {
mPlacesList->deleteItems(LLSD(mID - num_entries--)); mPlacesList->deleteItems(LLSD(mID - num_entries--));
} }
@@ -212,7 +217,7 @@ void LLFloaterTeleportHistory::loadFile(const std::string &file_name)
else else
{ {
const S32 max_entries = gSavedSettings.getS32("TeleportHistoryMaxEntries"); const S32 max_entries = gSavedSettings.getS32("TeleportHistoryMaxEntries");
const S32 num_entries = llmin(max_entries,(const S32)data.size()); const S32 num_entries = llmin(max_entries < 0 ? S32_MAX : max_entries,(const S32)data.size());
pScrollList->clear(); pScrollList->clear();
for(S32 i = 0; i < num_entries; i++) //Lower entry = newer for(S32 i = 0; i < num_entries; i++) //Lower entry = newer
{ {