Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Avination-4.0

Browse Source
This commit is contained in:
Melanie
2013-04-20 08:08:53 +02:00
parent 37f3695e78 3075429bca
commit 11ba4d0d7d
14 changed files with 84 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/xui/en-us/floater_chat_history.xml
View File

@@ -22,6 +22,7 @@
<string name="TrackYourCamera">Track your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="ControlYourCamera">Control your camera</string>
<string name="OverrideAnimations">Override your default animations</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" height="260" left="0" min_width="275" name="im_contents_panel" width="305">
<layout_stack border="false" bottom="0" default_tab_group="1" follows="all" height="260" left="0" orientation="vertical" name="im_contents_stack" width="305">

1
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -299,6 +299,7 @@
<string name="TrackYourCamera">Track your camera</string>
<string name="ControlYourCamera">Control your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="OverrideAnimations">Override your default animations</string>
<!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string>