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

Merge viewer-neko

Ansariel 2019-11-07 22:33:50 +01:00
parent 6e340961c0 aadbb3d912
commit de3ce3890c
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llfavoritesbar.cpp
View File

@ -1768,19 +1768,35 @@ void LLFavoritesOrderStorage::load()
<< LL_ENDL;
in_file.close();
// <FS:Ansariel> FIRE-10122 - User@grid stored_favorites.xml
//user_llsd = fav_llsd[gAgentUsername];
user_llsd = fav_llsd[gAgentUsername + " @ " + LLGridManager::getInstance()->getGridLabel()];
//if (fav_llsd.isMap() && fav_llsd.has(gAgentUsername))
//{
// user_llsd = fav_llsd[gAgentUsername];
if (fav_llsd.isMap() && fav_llsd.has(gAgentUsername + " @ " + LLGridManager::getInstance()->getGridLabel()))
{
user_llsd = fav_llsd[gAgentUsername + " @ " + LLGridManager::getInstance()->getGridLabel()];
// </FS:Ansariel>
S32 index = 0;
for (LLSD::array_iterator iter = user_llsd.beginArray();
S32 index = 0;
bool needs_validation = gSavedPerAccountSettings.getBOOL("ShowFavoritesOnLogin");
for (LLSD::array_iterator iter = user_llsd.beginArray();
iter != user_llsd.endArray(); ++iter)
{
mSortIndexes.insert(std::make_pair(iter->get("id").asUUID(), index));
index++;
{
// Validation
LLUUID fv_id = iter->get("id").asUUID();
if (needs_validation
&& (fv_id.isNull()
|| iter->get("asset_id").asUUID().isNull()
|| iter->get("name").asString().empty()
|| iter->get("slurl").asString().empty()))
{
mRecreateFavoriteStorage = true;
}
mSortIndexes.insert(std::make_pair(fv_id, index));
index++;
}
}
}
else
{
LL_WARNS("FavoritesBar") << "unable to open favorites from '" << filename << "'" << LL_ENDL;
@ -2035,6 +2051,8 @@ void LLFavoritesOrderStorage::rearrangeFavoriteLandmarks(const LLUUID& source_it
BOOL LLFavoritesOrderStorage::saveFavoritesRecord(bool pref_changed)
{
pref_changed |= mRecreateFavoriteStorage;
mRecreateFavoriteStorage = false;
LLUUID favorite_folder= gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
if (favorite_folder.isNull())

5
indra/newview/llfavoritesbar.h
View File

@ -255,6 +255,7 @@ private:
slurls_map_t mSLURLs;
std::set<LLUUID> mMissingSLURLs;
bool mIsDirty;
bool mRecreateFavoriteStorage;
struct IsNotInFavorites
{
@ -285,7 +286,9 @@ private:
inline
LLFavoritesOrderStorage::LLFavoritesOrderStorage() :
mIsDirty(false), mUpdateRequired(false)
mIsDirty(false),
mUpdateRequired(false),
mRecreateFavoriteStorage(false)
{ load(); }
#endif // LL_LLFAVORITESBARCTRL_H

13
indra/newview/llpanellogin.cpp
View File

@ -43,7 +43,6 @@
#include "llcommandhandler.h" // for secondlife:///app/login/
#include "llcombobox.h"
#include "llviewercontrol.h"
#include "llfloaterpreference.h"
#include "llfocusmgr.h"
#include "lllineeditor.h"
#include "llnotificationsutil.h"
@ -458,6 +457,10 @@ void LLPanelLogin::addFavoritesToStartLocation()
}
break;
}
if (combo->getValue().asString().empty())
{
combo->selectFirstItem();
}
}
LLPanelLogin::~LLPanelLogin()
@ -1277,13 +1280,13 @@ void LLPanelLogin::onSelectServer()
{
std::string location = location_combo->getValue().asString();
LLSLURL slurl(location); // generata a slurl from the location combo contents
if ( slurl.getType() == LLSLURL::LOCATION
&& slurl.getGrid() != LLGridManager::getInstance()->getGrid()
)
if (location.empty()
|| (slurl.getType() == LLSLURL::LOCATION
&& slurl.getGrid() != LLGridManager::getInstance()->getGrid())
)
{
// the grid specified by the location is not this one, so clear the combo
location_combo->setCurrentByIndex(0); // last location on the new grid
location_combo->setTextEntry(LLStringUtil::null);
}
}
break;