Skip to content
Snippets Groups Projects
Commit 315eee3a authored by Richard Linden's avatar Richard Linden
Browse files

Backed out changeset: d38e4f4982a0

parent 72c43237
Branches
Tags
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>
......
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
mouse_opaque="false" mouse_opaque="false"
name="chat_bar_layout_panel" name="chat_bar_layout_panel"
user_resize="true" user_resize="true"
width="250" > width="310" >
<panel <panel
name="chat_bar" name="chat_bar"
filename="panel_nearby_chat_bar.xml" filename="panel_nearby_chat_bar.xml"
left="0" left="0"
height="28" height="28"
width="248" width="308"
top="0" top="0"
mouse_opaque="false" mouse_opaque="false"
follows="left|right" follows="left|right"
...@@ -341,7 +341,7 @@ Disabled for now. ...@@ -341,7 +341,7 @@ Disabled for now.
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="62" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="mini_map_btn_panel" name="mini_map_btn_panel"
user_resize="false" user_resize="false"
......
...@@ -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>
...@@ -61,6 +61,44 @@ ...@@ -61,6 +61,44 @@
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="59"
mouse_opaque="false"
name="speak_panel"
top_delta="0"
user_resize="false"
width="108">
<talk_button
follows="left|right"
height="23"
layout="topleft"
left="0"
name="talk"
top="5"
width="105">
<show_button
tab_stop="true">
<init_callback
function="Button.SetDockableFloaterToggle"
parameter="voice_controls" />
</show_button>
<!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
& pad_right is default value for long label which can be right aligned. See EXT-6318 -->
<speak_button
halign="center"
label="Speak"
label_selected="Speak"
name="speak_btn"
pad_right="20"
tab_stop="true"
use_ellipses="true" />
</talk_button>
</layout_panel>
<layout_panel
auto_resize="false"
follows="right" follows="right"
height="28" height="28"
layout="topleft" layout="topleft"
......
...@@ -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