summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-07-17 18:29:46 +0300
committermaxim_productengine <mnikolenko@productengine.com>2018-07-17 18:29:46 +0300
commit7c82588ae3686cf982891a92164e384ff3475cc6 (patch)
tree6e39a6d945dfdb8aadac8b17277b18122ccd54a1
parent42ab393dd39e2e78cde2b55dcd04d21be6a51937 (diff)
MAINT-8883 Restore previous selection after updating the list
-rw-r--r--indra/newview/llpanelgroupnotices.cpp16
-rw-r--r--indra/newview/llpanelgroupnotices.h4
2 files changed, 17 insertions, 3 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index fe49ed0649..ce6834b4b3 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -303,6 +303,8 @@ void LLPanelGroupNotices::activate()
{
if(mNoticesList)
mNoticesList->deleteAllItems();
+
+ mPrevSelectedNotice = LLUUID();
BOOL can_send = gAgent.hasPowerInGroup(mGroupID,GP_NOTICES_SEND);
BOOL can_receive = gAgent.hasPowerInGroup(mGroupID,GP_NOTICES_RECEIVE);
@@ -454,12 +456,18 @@ void LLPanelGroupNotices::refreshNotices()
}
+void LLPanelGroupNotices::clearNoticeList()
+{
+ mPrevSelectedNotice = mNoticesList->getStringUUIDSelectedItem();
+ mNoticesList->deleteAllItems();
+}
+
void LLPanelGroupNotices::onClickRefreshNotices(void* data)
{
LL_DEBUGS() << "LLPanelGroupNotices::onClickGetPastNotices" << LL_ENDL;
LLPanelGroupNotices* self = (LLPanelGroupNotices*)data;
- self->mNoticesList->deleteAllItems();
+ self->clearNoticeList();
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("GroupNoticesListRequest");
@@ -547,7 +555,6 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
LLSD row;
row["id"] = id;
-
row["columns"][0]["column"] = "icon";
if (has_attachment)
{
@@ -577,7 +584,10 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
mNoticesList->updateSort();
if (mPanelViewNotice->getVisible())
{
- mNoticesList->selectFirstItem();
+ if (!mNoticesList->selectByID(mPrevSelectedNotice))
+ {
+ mNoticesList->selectFirstItem();
+ }
}
}
diff --git a/indra/newview/llpanelgroupnotices.h b/indra/newview/llpanelgroupnotices.h
index 04629b5f6b..46c8c241c6 100644
--- a/indra/newview/llpanelgroupnotices.h
+++ b/indra/newview/llpanelgroupnotices.h
@@ -65,6 +65,8 @@ public:
void refreshNotices();
+ void clearNoticeList();
+
virtual void setGroupID(const LLUUID& id);
private:
@@ -113,6 +115,8 @@ private:
LLOfferInfo* mInventoryOffer;
+ LLUUID mPrevSelectedNotice;
+
static std::map<LLUUID,LLPanelGroupNotices*> sInstances;
};