Skip to content
Snippets Groups Projects
Commit 09d6eece authored by Andrew Dyukov's avatar Andrew Dyukov
Browse files

Minor changes to EXT-2986 (Add "Leave Call" button in Voice Control Panel

for all voice chats except nearby) implementation.

--HG--
branch : product-engine
parent 06d5706c
No related branches found
No related tags found
No related merge requests found
...@@ -96,7 +96,9 @@ void LLCallFloater::leaveCall() ...@@ -96,7 +96,9 @@ void LLCallFloater::leaveCall()
{ {
LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel(); LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel();
if (voice_channel && voice_channel->isActive()) if (voice_channel && voice_channel->isActive())
{
voice_channel->deactivate(); voice_channel->deactivate();
}
} }
void LLCallFloater::updateSession() void LLCallFloater::updateSession()
...@@ -150,8 +152,8 @@ void LLCallFloater::updateSession() ...@@ -150,8 +152,8 @@ void LLCallFloater::updateSession()
updateTitle(); updateTitle();
//hide "Leave Call" button for nearby chat //hide "Leave Call" button for nearby chat
bool isLocalChat = mVoiceType == VC_LOCAL_CHAT; bool is_local_chat = mVoiceType == VC_LOCAL_CHAT;
childSetVisible("leave_btn_panel", !isLocalChat); childSetVisible("leave_btn_panel", !is_local_chat);
refreshPartisipantList(); refreshPartisipantList();
} }
......
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
</layout_panel> </layout_panel>
<layout_panel <layout_panel
layout="topleft" layout="topleft"
min_width="138"
name="volume_slider_panel" name="volume_slider_panel"
top="0" top="0"
user_resize="false" user_resize="false"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment