diff options
| author | richard <none@none> | 2010-01-12 11:49:56 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-12 11:49:56 -0800 |
| commit | eab73793fc0b1b3832a7ad190e0d62708f39be90 (patch) | |
| tree | f93e316f161c5a93656c0b40ca1b907970b335b5 | |
| parent | 00c850386c806a68eb74c3b637c3ffe5621bb260 (diff) | |
fixed resizing logic not working for call floater
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_controls.xml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 008ebf43b4..c0efb85b51 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -51,6 +51,7 @@ #include "lltransientfloatermgr.h" #include "llviewerwindow.h" #include "llvoicechannel.h" +#include "lllayoutstack.h" static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids); @@ -818,8 +819,8 @@ void reshape_floater(LLCallFloater* floater, S32 delta_height) } } - floater->reshape(floater_rect.getWidth(), floater_rect.getHeight()); - floater->setRect(floater_rect); + floater->setShape(floater_rect); + floater->getChild<LLLayoutStack>("my_call_stack")->updateLayout(FALSE); } void LLCallFloater::reshapeToFitContent() diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index c438d28236..ae198d69a3 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -122,7 +122,6 @@ follows="left|right|top" height="24" layout="topleft" - background_visible="false" left="0" name="non_avatar_caller" top="10" |