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

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

Browse Source 
Conflicts:
	indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
This commit is contained in:
Siana Gearz
2012-01-13 19:18:22 +01:00
parent b2dd4f652e 09c7e66844
commit 09d37d7dfd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings_ascent.xml
View File

@@ -579,7 +579,7 @@
<key>AscentCmdLineKeyToName</key>
<map>
<key>Comment</key>
<string>Use a fast key to name querry</string>
<string>Use a fast key to name query</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

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

@@ -21,7 +21,7 @@
<slider bottom_delta="-20" left="5" control_name="RenderAvatarMaxVisible"
decimal_digits="0" enabled="true" follows="left|bottom" height="20"
increment="1" label="Max Avs:" can_edit_text="true"
label_width="53" max_val="50" min_val="1" val_width="36" mouse_opaque="true"
label_width="53" max_val="50" min_val="1" 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"