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

SL-14770 Sorting group notices by date disconnects the viewer. 

getItemIndex() on each insertion can be very expensive, use std::set's find instead
master
Andrey Kleshchev 2021-04-06 20:12:28 +03:00
parent 2be5baf70d
commit 77147012ff
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
indra/newview/llpanelgroupnotices.cpp
View File

@ -305,8 +305,11 @@ BOOL LLPanelGroupNotices::postBuild()
void LLPanelGroupNotices::activate()
{
if(mNoticesList)
mNoticesList->deleteAllItems();
if (mNoticesList)
{
mNoticesList->deleteAllItems();
mKnownNoticeIds.clear();
}
mPrevSelectedNotice = LLUUID();
@ -413,6 +416,7 @@ void LLPanelGroupNotices::onClickSendMessage(void* data)
row["columns"][4]["value"] = llformat( "%u", timestamp);
self->mNoticesList->addElement(row, ADD_BOTTOM);
self->mKnownNoticeIds.insert(id);
self->mCreateMessage->clear();
self->mCreateSubject->clear();
@ -443,27 +447,13 @@ void LLPanelGroupNotices::onClickNewMessage(void* data)
void LLPanelGroupNotices::refreshNotices()
{
onClickRefreshNotices(this);
/*
LL_DEBUGS() << "LLPanelGroupNotices::onClickGetPastNotices" << LL_ENDL;
mNoticesList->deleteAllItems();
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("GroupNoticesListRequest");
msg->nextBlock("AgentData");
msg->addUUID("AgentID",gAgent.getID());
msg->addUUID("SessionID",gAgent.getSessionID());
msg->nextBlock("Data");
msg->addUUID("GroupID",self->mGroupID);
gAgent.sendReliableMessage();
*/
}
void LLPanelGroupNotices::clearNoticeList()
{
mPrevSelectedNotice = mNoticesList->getStringUUIDSelectedItem();
mNoticesList->deleteAllItems();
mKnownNoticeIds.clear();
}
void LLPanelGroupNotices::onClickRefreshNotices(void* data)
@ -541,13 +531,14 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
return;
}
//with some network delays we can receive notice list more then once...
//so add only unique notices
S32 pos = mNoticesList->getItemIndex(id);
// Due to some network delays we can receive notice list more than once...
// So add only unique notices
if (mKnownNoticeIds.find(id) != mKnownNoticeIds.end())
{
// If items with this ID already in the list - skip it
continue;
}
if(pos!=-1)//if items with this ID already in the list - skip it
continue;
msg->getString("Data","Subject",subj,i);
msg->getString("Data","FromName",name,i);
msg->getBOOL("Data","HasAttachment",has_attachment,i);
@ -582,6 +573,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
row["columns"][4]["value"] = llformat( "%u", timestamp);
mNoticesList->addElement(row, ADD_BOTTOM);
mKnownNoticeIds.insert(id);
}
mNoticesList->setNeedsSort(save_sort);

1
indra/newview/llpanelgroupnotices.h
View File

@ -110,6 +110,7 @@ private:
LLIconCtrl *mViewInventoryIcon;
LLScrollListCtrl *mNoticesList;
std::set<LLUUID> mKnownNoticeIds; // Dupplicate avoidance, to avoid searching and inserting dupplciates into mNoticesList
std::string mNoNoticesStr;