Skip to content
Snippets Groups Projects
Commit b0ebba41 authored by Leyla Farazha's avatar Leyla Farazha
Browse files

merge fix for voice

parent d5faa4f3
No related branches found
No related tags found
No related merge requests found
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>1</integer>
</map> </map>
<key>HelpURLFormat</key> <key>HelpURLFormat</key>
<map> <map>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>0</integer>
</map> </map>
<key>VoiceDisableMic</key> <key>VoiceDisableMic</key>
<map> <map>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>0</integer>
</map> </map>
<key>ScriptsCanShowUI</key> <key>ScriptsCanShowUI</key>
<map> <map>
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>1</integer>
</map> </map>
<key>EnableAvatarShare</key> <key>EnableAvatarShare</key>
<map> <map>
......
...@@ -42,5 +42,40 @@ ...@@ -42,5 +42,40 @@
show_speaking_indicator="false" show_speaking_indicator="false"
width="147" /> width="147" />
</layout_panel> </layout_panel>
<layout_panel
auto_resize="false"
follows="top|left|right"
height="25"
layout="topleft"
min_height="25"
width="130"
name="call_btn_panel"
user_resize="false"
visible="false">
<button
follows="all"
height="20"
label="Call"
name="call_btn"
width="130"
top="5" />
</layout_panel>
<layout_panel
auto_resize="false"
follows="top|left|right"
height="25"
layout="topleft"
min_height="25"
width="130"
name="end_call_btn_panel"
user_resize="false"
visible="false">
<button
follows="all"
height="20"
label="Leave Call"
name="end_call_btn"
top="5"/>
</layout_panel>
</layout_stack> </layout_stack>
</panel> </panel>
...@@ -77,6 +77,39 @@ ...@@ -77,6 +77,39 @@
tool_tip = "Offer to teleport this person" tool_tip = "Offer to teleport this person"
width="140" /> width="140" />
</layout_panel> </layout_panel>
<layout_panel
auto_resize="false"
follows="top|left|right"
height="25"
layout="topleft"
min_height="25"
width="140"
name="call_btn_panel"
user_resize="false">
<button
follows="left|top|right"
height="23"
label="Call"
name="call_btn"
width="140" />
</layout_panel>
<layout_panel
auto_resize="false"
follows="top|left|right"
height="25"
layout="topleft"
min_height="25"
width="140"
name="end_call_btn_panel"
user_resize="false"
visible="false">
<button
follows="left|top|right"
height="23"
label="End Call"
name="end_call_btn"
width="140" />
</layout_panel>
<layout_panel <layout_panel
mouse_opaque="false" mouse_opaque="false"
auto_resize="true" auto_resize="true"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment