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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
Beeks
2010-08-29 23:48:25 -04:00
parent dfa2e001ff bb89f6b9be
commit a3f3dad4c4
10 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/skins/default/xui/en-us/menu_login.xml
View File

@@ -21,11 +21,11 @@
<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="80" mouse_opaque="false" name="Help"
opaque="true" tear_off="false" width="166">
<menu_item_call bottom="-29" enabled="true" height="19" label="Snowglobe/Second Life Help" left="0"
<menu_item_call bottom="-29" enabled="true" height="19" label="Ascent Help" left="0"
mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" />
</menu_item_call>
<menu_item_call bottom="-48" enabled="true" height="19" label="About Snowglobe..." left="0"
<menu_item_call bottom="-48" enabled="true" height="19" label="About Ascent..." left="0"
mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" />
</menu_item_call>

4
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -874,7 +874,7 @@
<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="227" mouse_opaque="false" name="Help"
opaque="true" tear_off="true" width="166">
<menu_item_call bottom="-29" enabled="true" height="19" label="Snowglobe/Second Life Help" left="0"
<menu_item_call bottom="-29" enabled="true" height="19" label="Ascent/Second Life Help" left="0"
mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" />
</menu_item_call>
@@ -950,7 +950,7 @@
userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call>
</menu>
<menu_item_call bottom="-313" enabled="true" height="19" label="About Snowglobe..." left="0"
<menu_item_call bottom="-313" enabled="true" height="19" label="About Ascent..." left="0"
mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" />
</menu_item_call>

2
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -6240,7 +6240,7 @@ Flexible objects may not be physical and must be phantom until the flexible chec
name="FirstDebugMenus"
type="notify">
You have enabled the Advanced menu.
This menu contains features useful for developers debugging Snowglobe.
This menu contains features useful for developers debugging Ascent.
To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
</notification>

2
indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
View File

@@ -9,7 +9,7 @@
Use external web browser (Firefox, Safari, Internet Explorer)
</radio_item>
<radio_item bottom="-40" height="20" left="0" name="internal" width="480"
tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Snowglobe.">
tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Ascent.">
Use built-in web browser
</radio_item>
</radio_group>

2
indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
View File

@@ -32,6 +32,6 @@
embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
Click the Next button to configure Voice Chat preferences or click Finish to continue using Snowglobe.
Click the Next button to configure Voice Chat preferences or click Finish to continue using Ascent.
</text_editor>
</panel>