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

CHUI-608 (Conversations floater can be resized too small once a conversation is torn off)

meow-7.2.2
maximbproductengine 2013-01-03 06:43:25 +02:00
parent f40ee4792d
commit 3d83fc3da5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloaterimcontainer.h
View File

@ -106,6 +106,8 @@ public:
bool enableContextMenuItem(const std::string& item, uuid_vec_t& selectedIDS);
void doToParticipants(const std::string& item, uuid_vec_t& selectedIDS);
void assignResizeLimits();
private:
typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t;
avatarID_panel_map_t mSessions;
@ -154,7 +156,6 @@ private:
void toggleAllowTextChat(const LLUUID& participant_uuid);
void toggleMute(const LLUUID& participant_id, U32 flags);
void openNearbyChat();
void assignResizeLimits();
LLButton* mExpandCollapseBtn;
LLButton* mStubCollapseBtn;

5
indra/newview/llfloaterimsessiontab.cpp
View File

@ -751,6 +751,11 @@ void LLFloaterIMSessionTab::onTearOffClicked()
{
forceReshape();
}
LLFloaterIMContainer* container = LLFloaterIMContainer::getInstance();
if (container)
{
container->assignResizeLimits();
}
refreshConversation();
updateGearBtn();
}