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

EXP-1411 FIX "Speak" button enabled in regions with disabled voice 

EXP-1424 FIX Floaters open on top of one another in default position with no offset
floaters now stack with their own kind preferentially
master
Richard Nelson 2011-10-19 17:47:05 -07:00
parent 2bf9acabfb
commit ea1c3218e2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/llfloater.cpp
View File

@ -685,7 +685,12 @@ void LLFloater::openFloater(const LLSD& key)
}
else
{
applyControlsAndPosition(LLFloaterReg::getLastFloaterCascading());
LLFloater* floater_to_stack = LLFloaterReg::getLastFloaterInGroup(mInstanceName);
if (!floater_to_stack)
{
floater_to_stack = LLFloaterReg::getLastFloaterCascading();
}
applyControlsAndPosition(floater_to_stack);
setMinimized(FALSE);
setVisibleAndFrontmost(mAutoFocus);
}

2
indra/newview/llagent.cpp
View File

@ -175,7 +175,7 @@ bool LLAgent::isActionAllowed(const LLSD& sdname)
}
else if (param == "speak")
{
if ( gAgent.isVoiceConnected() )
if ( gAgent.isVoiceConnected() && LLViewerParcelMgr::getInstance()->allowAgentVoice() )
{
retval = true;
}