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

FIRE-14328: Fix crash when toggling legacy username options

Ansariel 2014-08-12 16:28:42 +02:00
parent 700a0eab00
commit b504192083
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/fsfloatercontacts.cpp
View File

@ -89,7 +89,8 @@ FSFloaterContacts::FSFloaterContacts(const LLSD& seed)
mAllowRightsChange(TRUE),
mNumRightsChanged(0),
mRlvBehaviorCallbackConnection(),
mResetLastColumnDisplayModeChanged(false)
mResetLastColumnDisplayModeChanged(false),
mDirtyNames(false)
{
mObserver = new LLLocalFriendsObserver(this);
LLAvatarTracker::instance().addObserver(mObserver);
@ -173,6 +174,12 @@ void FSFloaterContacts::draw()
mResetLastColumnDisplayModeChanged = false;
}
if (mDirtyNames)
{
onDisplayNameChanged();
mDirtyNames = false;
}
LLFloater::draw();
}
@ -1173,7 +1180,7 @@ void FSFloaterContacts::onDisplayNameChanged()
}
else
{
LLAvatarNameCache::get((*it)->getUUID(), boost::bind(&FSFloaterContacts::onDisplayNameChanged, this));
LLAvatarNameCache::get((*it)->getUUID(), boost::bind(&FSFloaterContacts::setDirtyNames, this));
}
}
}

3
indra/newview/fsfloatercontacts.h
View File

@ -151,6 +151,7 @@ private:
std::string mLastColumnDisplayModeChanged;
bool mResetLastColumnDisplayModeChanged;
bool mDirtyNames;
void childShowTab(const std::string& id, const std::string& tabname);
@ -158,6 +159,8 @@ private:
boost::signals2::connection mRlvBehaviorCallbackConnection;
std::string getFullName(const LLAvatarName& av_name);
void setDirtyNames() { mDirtyNames = true; }
};