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

Compiles and fixes, fixes and compiles

Browse Source 
Pull this commit, get through the trials
This commit is contained in:
Lirusaito
2019-02-11 21:49:01 -05:00
parent 97a6f8aeb0
commit 48541479fb
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfavoritesbar.cpp
View File

@@ -912,7 +912,7 @@ BOOL LLFavoritesBarCtrl::postBuild()
return TRUE; return TRUE;
} }
BOOL LLFavoritesBarCtrl::collectFavoriteItems(LLInventoryModel::item_array_t& items) BOOL collectFavoriteItems(LLInventoryModel::item_array_t& items)
{ {
auto mFavoriteFolderId = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE); auto mFavoriteFolderId = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
@@ -927,6 +927,7 @@ BOOL LLFavoritesBarCtrl::collectFavoriteItems(LLInventoryModel::item_array_t& it
std::sort(items.begin(), items.end(), LLFavoritesSort()); std::sort(items.begin(), items.end(), LLFavoritesSort());
BOOL needToSaveItemsOrder(const LLInventoryModel::item_array_t& items);
if (needToSaveItemsOrder(items)) if (needToSaveItemsOrder(items))
{ {
S32 sortField = 0; S32 sortField = 0;
@@ -938,6 +939,7 @@ BOOL LLFavoritesBarCtrl::collectFavoriteItems(LLInventoryModel::item_array_t& it
return TRUE; return TRUE;
} }
BOOL LLFavoritesBarCtrl::collectFavoriteItems(LLInventoryModel::item_array_t& items) { return ::collectFavoriteItems(items); }
void LLFavoritesBarCtrl::showDropDownMenu() void LLFavoritesBarCtrl::showDropDownMenu()
{ {
@@ -1363,7 +1365,7 @@ LLUICtrl* LLFavoritesBarCtrl::findChildByLocalCoords(S32 x, S32 y)
return ctrl; return ctrl;
} }
BOOL LLFavoritesBarCtrl::needToSaveItemsOrder(const LLInventoryModel::item_array_t& items) BOOL needToSaveItemsOrder(const LLInventoryModel::item_array_t& items)
{ {
BOOL result = FALSE; BOOL result = FALSE;
@@ -1379,6 +1381,7 @@ BOOL LLFavoritesBarCtrl::needToSaveItemsOrder(const LLInventoryModel::item_array
return result; return result;
} }
BOOL LLFavoritesBarCtrl::needToSaveItemsOrder(const LLInventoryModel::item_array_t& items) { return ::needToSaveItemsOrder(items); }
void LLFavoritesBarCtrl::insertItem(LLInventoryModel::item_array_t& items, const LLUUID& dest_item_id, LLViewerInventoryItem* insertedItem, bool insert_before) void LLFavoritesBarCtrl::insertItem(LLInventoryModel::item_array_t& items, const LLUUID& dest_item_id, LLViewerInventoryItem* insertedItem, bool insert_before)
{ {

4
indra/newview/llfolderview.cpp
View File

@@ -2164,8 +2164,8 @@ void LLFolderView::doIdle()
} }
LLFavoritesOrderStorage::instance(); // Singu TODO: Favorites bar. LLFavoritesOrderStorage::instance(); // Singu TODO: Favorites bar.
BOOL collectFavoriteItems(); BOOL collectFavoriteItems(LLInventoryModel::item_array_t&);
collectFavoriteItems(); collectFavoriteItems(LLInventoryModel::item_array_t());
LL_RECORD_BLOCK_TIME(FTM_INVENTORY); LL_RECORD_BLOCK_TIME(FTM_INVENTORY);

4
indra/newview/llpanellogin.cpp
View File

@@ -373,8 +373,8 @@ void LLPanelLogin::addFavoritesToStartLocation()
// Load favorites into the combo. // Load favorites into the combo.
const auto grid = gHippoGridManager->getCurrentGrid(); const auto grid = gHippoGridManager->getCurrentGrid();
std::string first, last; std::string first, last, password;
getFields(first, last, std::string()); getFields(first, last, password);
auto user_defined_name(first + ' ' + last); auto user_defined_name(first + ' ' + last);
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites_" + grid->getGridName() + ".xml"); std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites_" + grid->getGridName() + ".xml");
std::string old_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml"); std::string old_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");