diff options
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 5c4a02f013..f346a4b8c2 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -51,7 +51,6 @@ #include "lltransientfloatermgr.h" #include "llviewerwindow.h" #include "llvoicechannel.h" -#include "lllayoutstack.h" static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids); void reshape_floater(LLCallFloater* floater, S32 delta_height); @@ -306,32 +305,7 @@ void LLCallFloater::updateSession() //hide "Leave Call" button for nearby chat bool is_local_chat = mVoiceType == VC_LOCAL_CHAT; - - LLPanel* leave_panel = findChild<LLPanel>("leave_call_btn_panel"); - if (leave_panel) - { - S32 delta = 0; - bool visible = !is_local_chat; - if ((bool)leave_panel->getVisible() != visible) - { - delta = visible - ? leave_panel->getRect().getHeight() - : -leave_panel->getRect().getHeight(); - } - leave_panel->setVisible(visible); - if (delta) - { - LLLayoutStack* stack = getChild<LLLayoutStack>("my_call_stack"); - BOOL animate = stack->getAnimate(); - // Disable animation to prevent layout updating in several frames. - // We need this to get work reshapeToFitContent properly, otherwise - // the height of leave_call_btn_panel won't be completely included. - stack->setAnimate(FALSE); - reshape_floater(this, delta); - // Restore animate state. - stack->setAnimate(animate); - } - } + childSetVisible("leave_call_btn_panel", !is_local_chat); refreshParticipantList(); updateAgentModeratorState(); @@ -814,24 +788,4 @@ void LLCallFloater::reset() mSpeakerManager = NULL; } -S32 LLCallFloater::getParticipantItemHeight() -{ - std::vector<LLPanel*> items; - mAvatarList->getItems(items); - if(items.size() > 0) - { - return items[0]->getRect().getHeight(); - } - else - { - return getChild<LLPanel>("non_avatar_caller")->getRect().getHeight(); - } -} - -S32 LLCallFloater::getMaxVisibleItems() -{ - static LLCachedControl<S32> max_visible_items(*LLUI::sSettingGroups["config"],"CallFloaterMaxItems"); - return max_visible_items; -} - //EOF |