Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0

master
Lis Linden 2010-02-01 18:20:15 -05:00
commit 2fea74af06
4 changed files with 5 additions and 5 deletions

View File

@ -38,7 +38,7 @@
width="170" />
<button
height="20"
label="Play in World"
label="Play Inworld"
label_selected="Stop"
layout="topleft"
left="10"

View File

@ -38,8 +38,8 @@
<button
follows="left|top"
height="22"
label="Play in World"
label_selected="Play in World"
label="Play Inworld"
label_selected="Play Inworld"
layout="topleft"
name="Sound play btn"
sound_flags="0"

View File

@ -516,7 +516,7 @@
layout="topleft"
name="Animation Separator" />
<menu_item_call
label="Play in World"
label="Play Inworld"
layout="topleft"
name="Animation Play">
<menu_item_call.on_click

View File

@ -85,7 +85,7 @@
left="45"
name="where"
text_color="LtGray_50"
value="(In World)"
value="(inworld)"
width="150" />
<panel
follows="all"