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

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-01-13 19:14:43 +01:00
parent 6bbff07e00 c371b82900
commit b2dd4f652e
47 changed files with 2019 additions and 1608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -881,10 +881,15 @@
<on_click function="PromptShowURL" name="PublicIssueTrackerHelp_url"
userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
</menu_item_call>
<menu_item_call bottom="-94" enabled="true" height="19" label="Singularity Issue Tracker..."
left="0" mouse_opaque="true" name="Singularity Issue Tracker..." width="166">
<on_click function="PromptShowURL" name="SinguIssueTracker_url"
userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/list" />
</menu_item_call>
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator7" width="250" />
<menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
mouse_opaque="true" name="Bug Reporing 101..." width="166">
mouse_opaque="true" name="Bug Reporting 101..." width="166">
<on_click function="PromptShowURL" name="BugReporting101_url"
userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
</menu_item_call>
@@ -905,6 +910,11 @@
<on_click function="PromptShowURL" name="ReportBug_url"
userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call>
<menu_item_call bottom="-240" enabled="true" height="19" label="Report Singularity Bug..." left="0"
mouse_opaque="true" name="Report Singularity Bug..." width="166">
<on_click function="PromptShowURL" name="ReportSinguBug_url"
userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/entry" />
</menu_item_call>
</menu>
<menu_item_call bottom="-313" enabled="true" height="19" label="About Singularity..." left="0"
mouse_opaque="true" name="About Second Life..." width="166">

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

@@ -1885,7 +1885,7 @@ No Group selected.
type="alertmodal">
Unable to deed land:
Cannot find the region this land is in.
Please use Tools -&gt; Report Bug to report this.
Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
</notification>
<notification
@@ -1976,7 +1976,7 @@ Parcels you own appear in green.
Unable to abandon land:
Cannot find the region this land is in.
Please use Tools -&gt; Report Bug to report this.
Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
</notification>
<notification
@@ -2050,7 +2050,7 @@ Divide land?
Unable to divide land:
Cannot find the region this land is in.
Please use Tools -&gt; Report Bug to report this.
Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
</notification>
<notification
@@ -2060,7 +2060,7 @@ Please use Tools -&gt; Report Bug to report this.
Unable to join land:
Cannot find the region this land is in.
Please use Tools -&gt; Report Bug to report this.
Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
</notification>
<notification
@@ -2177,7 +2177,7 @@ Unable to save &apos;[NAME]&apos; to wearable file. You will need to free up so
Unable to save [NAME] to central asset store.
This is usually a temporary failure. Please customize and save the wearable again in a few minutes.
If this problem persists, please click on the &apos;Tools &gt; Report Bug&apos; pull down menu
If this problem persists, please click on the &apos;Help -&gt; Bug Reporting &gt; Report Bug&apos; pull down menu
and provide details about your network setup.
</notification>
@@ -2948,6 +2948,18 @@ Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and othe
yestext="Go to page"/>
</notification>
<notification
icon="alertmodal.tga"
name="WebLaunchSinguIssue"
type="alertmodal">
Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer.
<usetemplate
ignoretext="When launching web browser to view Singularity Issue Tracker"
name="okcancelignore"
notext="Cancel"
yestext="Go to page"/>
</notification>
<notification
icon="alertmodal.tga"
name="WebLaunchPublicIssueHelp"

52
indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
View File

@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bg_visible="false" border="false" border_visible="false" bottom="1"
<panel bg_visible="false" border="false" border_visible="false" bottom="0"
follows="left|bottom" height="220" left="0" name="Adv_Settings"
use_bounding_rect="true" width="220" >
<panel bottom="0" filename="panel_bg_tab.xml" height="185" left="0" width="205" />
<slider bottom="160" left="10" control_name="RenderFarClip"
<panel bottom="1" filename="panel_bg_tab.xml" height="185" left="0" width="197" />
<slider bottom="160" left="5" control_name="RenderFarClip"
decimal_digits="0" enabled="true" follows="left|bottom" height="20"
increment="8" label="Draw Dist.:" can_edit_text="true"
label_width="55" max_val="1024" min_val="24" mouse_opaque="true"
name="DrawDistance" show_text="true" width="195" tool_tip="Change your Draw Distance"/>
<slider bottom_delta="-20" left_delta="-0" control_name="ThrottleBandwidthKBPS"
label_width="53" max_val="1024" min_val="24" val_width="36" mouse_opaque="true"
name="DrawDistance" show_text="true" width="189" tool_tip="Change your Draw Distance"/>
<slider bottom_delta="-20" left="5" control_name="ThrottleBandwidthKBPS"
decimal_digits="0" enabled="true" follows="left|bottom" height="20"
increment="50" label="Bandwidth:" can_edit_text="true"
label_width="60" max_val="5000" min_val="50" mouse_opaque="true"
name="max_bandwidth" show_text="true" width="195" tool_tip="Set your Network bandwidth in kbps (kilobits per second)"/>
<slider bottom_delta="-20" left_delta="-0" control_name="RenderMaxPartCount"
label_width="53" max_val="5000" min_val="50" val_width="36" mouse_opaque="true"
name="max_bandwidth" show_text="true" width="189" tool_tip="Set your Network bandwidth in kbps (kilobits per second)"/>
<slider bottom_delta="-20" left="5" control_name="RenderMaxPartCount"
decimal_digits="0" enabled="true" follows="left|bottom" height="20"
increment="256" label="Particles:" can_edit_text="true"
label_width="55" max_val="8192" min_val="0" mouse_opaque="true"
name="MaxParticleCount" show_text="true" width="195" tool_tip="Amount of particles to render"/>
<slider bottom_delta="-20" left_delta="0" control_name="RenderAvatarMaxVisible"
label_width="53" max_val="8192" min_val="0" val_width="36" mouse_opaque="true"
name="MaxParticleCount" show_text="true" width="189" tool_tip="Amount of particles to render"/>
<slider bottom_delta="-20" left="5" control_name="RenderAvatarMaxVisible"
decimal_digits="0" enabled="true" follows="left|bottom" height="20"
increment="1" label="Max Avatars:" can_edit_text="true"
label_width="65" max_val="50" min_val="1" mouse_opaque="true"
name="RenderAvatarMaxVisible" show_text="true" width="195" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
<slider bottom_delta="-20" left_delta="-0" control_name="RenderMaxNodeSize"
increment="1" label="Max Avs:" can_edit_text="true"
label_width="53" max_val="50" min_val="1" val_width="36" mouse_opaque="true"
name="RenderAvatarMaxVisible" show_text="true" width="189" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
<slider bottom_delta="-20" left="5" control_name="RenderMaxNodeSize"
decimal_digits="0" enabled="true" follows="left|bottom" height="20"
increment="64" label="Max Node:" can_edit_text="true"
label_width="55" max_val="16382" min_val="64" mouse_opaque="true"
name="RenderMaxNodeSize" show_text="true" width="195" tool_tip="Maximum memory size limit for rendering NEW objects, in Kb. Anything over the limit will not be rendered. [Default 4096]"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_7" width="512">
label_width="53" max_val="16382" min_val="64" val_width="36" mouse_opaque="true"
name="RenderMaxNodeSize" show_text="true" width="189" tool_tip="Maximum memory size limit for rendering NEW objects, in Kb. Anything over the limit will not be rendered. [Default 4096]"/>
<text bottom_delta="-17" follows="left|top" font="SansSerifSmall" height="16" left="5"
name="cmd_line_text_7" width="189">
Windlight Sky Preset:
</text>
<combo_box name="WLSkyPresetsCombo" bottom_delta="-20" left="40" follows="left|top" height="18" width="150" max_chars="20"
<combo_box name="WLSkyPresetsCombo" bottom_delta="-20" left="5" follows="left|top" height="18" width="189" max_chars="20"
mouse_opaque="true" allow_text_entry="false" tool_tip="WindLight Presets for your Sky." />
<text bottom_delta="-18" follows="left|bottom" font="SansSerifSmall" height="16" left="10"
name="cmd_line_text_7" width="512">
<text bottom_delta="-17" follows="left|bottom" font="SansSerifSmall" height="16" left="5"
name="cmd_line_text_7" width="189">
Windlight Water Preset:
</text>
<combo_box name="WLWaterPresetsCombo" bottom_delta="-20" left="40" follows="left|top" height="18" width="150" max_chars="20"
mouse_opaque="true" allow_text_entry="false" tool_tip="WindLight Presets for your Sky." />
<button bottom="1" height="22" label="" left="5" name="expand" scale_image="true" toggle="true"
<combo_box name="WLWaterPresetsCombo" bottom_delta="-20" left="5" follows="left|bottom" height="18" width="166" max_chars="20"
mouse_opaque="true" allow_text_entry="false" tool_tip="WindLight Presets for your Water." />
<button bottom="0" height="22" label="" left="172" name="expand" scale_image="true" toggle="true"
tool_tip="Hide the Settings Panel" width="22" />
</panel>

4
indra/newview/skins/default/xui/fr/menu_viewer.xml
View File

@@ -248,7 +248,7 @@
<on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" />
</menu_item_call>
<menu_item_separator label="-----------" name="separator7"/>
<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101...">
<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporting 101...">
<on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/>
</menu_item_call>
<menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
@@ -261,4 +261,4 @@
<menu_item_call label="À propos de Singularity..." name="About Second Life..."/>
</menu>
</menu_bar>
</menu></menu>
</menu></menu>

4
indra/newview/skins/default/xui/fr/notifications.xml
View File

@@ -1291,6 +1291,10 @@ Télécharger vers le dossier Applications ?
Pour apprendre à utiliser JIRA, consultez le Wiki de [SECOND_LIFE].
<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur le JIRA" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
</notification>
<notification name="WebLaunchSinguIssue">
Pour signaler des bugs et autres problèmes avec Singularity, utilisez le Google Issue Tracker.
<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le Google Issue Tracker" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
</notification>
<notification name="WebLaunchSupportWiki">
Visitez le blog officiel des Lindens pour les dernières nouvelles et informations.
<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le blog" name="okcancelignore" notext="Annuler" yestext="Aller à la page"/>