1. simon_linden
  2. viewer-rabbit

Commits

Richard Linden  committed 03d2062

EXP-1452 FIX minimum height of NEARBY CHAT window can be circumvented by minimizing it.

  • Participants
  • Parent commits e0a1360
  • Branches default

Comments (0)

Files changed (1)

File indra/newview/llnearbychatbar.cpp

View file
 
 void LLNearbyChatBar::showHistory()
 {
+	openFloater();
+
 	if (!getChildView("nearby_chat")->getVisible())
 	{
 		onToggleNearbyChatPanel();
 	}
-	
-	openFloater();
 }
 
 void LLNearbyChatBar::draw()
 
 	if (nearby_chat->getVisible())
 	{
-		mExpandedHeight = getRect().getHeight();
+		if (!isMinimized())
+		{
+			mExpandedHeight = getRect().getHeight();
+		}
 		setResizeLimits(getMinWidth(), COLLAPSED_HEIGHT);
 		nearby_chat->setVisible(FALSE);
 		reshape(getRect().getWidth(), COLLAPSED_HEIGHT);