Skip to content
Snippets Groups Projects
Commit e3963666 authored by dmitrykproductengine's avatar dmitrykproductengine
Browse files

MAINT-3133 FIXED Expand Nearby Chat participant list on first open of...

MAINT-3133 FIXED Expand Nearby Chat participant list on first open of Conversations floater, per login session
parent a6c4863a
Branches
Tags
No related merge requests found
...@@ -77,6 +77,17 @@ ...@@ -77,6 +77,17 @@
<key>Value</key> <key>Value</key>
<integer>412</integer> <integer>412</integer>
</map> </map>
<key>ConversationsParticipantListCollapsed</key>
<map>
<key>Comment</key>
<string>Stores the expanded/collapsed state of Nearby chat participant list</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>true</integer>
</map>
<key>InstantMessageLogPath</key> <key>InstantMessageLogPath</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
......
...@@ -101,6 +101,7 @@ LLFloaterIMContainer::~LLFloaterIMContainer() ...@@ -101,6 +101,7 @@ LLFloaterIMContainer::~LLFloaterIMContainer()
gSavedPerAccountSettings.setBOOL("ConversationsListPaneCollapsed", mConversationsPane->isCollapsed()); gSavedPerAccountSettings.setBOOL("ConversationsListPaneCollapsed", mConversationsPane->isCollapsed());
gSavedPerAccountSettings.setBOOL("ConversationsMessagePaneCollapsed", mMessagesPane->isCollapsed()); gSavedPerAccountSettings.setBOOL("ConversationsMessagePaneCollapsed", mMessagesPane->isCollapsed());
gSavedPerAccountSettings.setBOOL("ConversationsParticipantListCollapsed", !isParticipantListExpanded());
if (!LLSingleton<LLIMMgr>::destroyed()) if (!LLSingleton<LLIMMgr>::destroyed())
{ {
...@@ -250,6 +251,11 @@ BOOL LLFloaterIMContainer::postBuild() ...@@ -250,6 +251,11 @@ BOOL LLFloaterIMContainer::postBuild()
// Init the sort order now that the root had been created // Init the sort order now that the root had been created
setSortOrder(LLConversationSort(gSavedSettings.getU32("ConversationSortOrder"))); setSortOrder(LLConversationSort(gSavedSettings.getU32("ConversationSortOrder")));
//We should expand nearby chat participants list for the new user
if(gAgent.isFirstLogin() || !gSavedPerAccountSettings.getBOOL("ConversationsParticipantListCollapsed"))
{
expandConversation();
}
// Keep the xml set title around for when we have to overwrite it // Keep the xml set title around for when we have to overwrite it
mGeneralTitle = getTitle(); mGeneralTitle = getTitle();
...@@ -2082,6 +2088,19 @@ void LLFloaterIMContainer::expandConversation() ...@@ -2082,6 +2088,19 @@ void LLFloaterIMContainer::expandConversation()
} }
} }
} }
bool LLFloaterIMContainer::isParticipantListExpanded()
{
bool is_expanded = false;
if(!mConversationsPane->isCollapsed())
{
LLConversationViewSession* widget = dynamic_cast<LLConversationViewSession*>(get_ptr_in_map(mConversationsWidgets,getSelectedSession()));
if (widget)
{
is_expanded = widget->isOpen();
}
}
return is_expanded;
}
// By default, if torn off session is currently frontmost, LLFloater::isFrontmost() will return FALSE, which can lead to some bugs // By default, if torn off session is currently frontmost, LLFloater::isFrontmost() will return FALSE, which can lead to some bugs
// So LLFloater::isFrontmost() is overriden here to check both selected session and the IM floater itself // So LLFloater::isFrontmost() is overriden here to check both selected session and the IM floater itself
......
...@@ -172,6 +172,7 @@ class LLFloaterIMContainer ...@@ -172,6 +172,7 @@ class LLFloaterIMContainer
void toggleAllowTextChat(const LLUUID& participant_uuid); void toggleAllowTextChat(const LLUUID& participant_uuid);
void toggleMute(const LLUUID& participant_id, U32 flags); void toggleMute(const LLUUID& participant_id, U32 flags);
void openNearbyChat(); void openNearbyChat();
bool isParticipantListExpanded();
LLButton* mExpandCollapseBtn; LLButton* mExpandCollapseBtn;
LLButton* mStubCollapseBtn; LLButton* mStubCollapseBtn;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment