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

Merge remote-tracking branch 'Liru/master'

Browse Source
This commit is contained in:
Damian Zhaoying
2013-08-08 13:43:19 -03:00
parent 2679148aec cc534487c0
commit ca61a11825
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5918,7 +5918,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>EnableGestureSoundsSelf</key> <key>EnableGestureSoundsSelf</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Play sounds from your gestures when EnableGestureSounds is false. (Useless otherewise)</string> <string>Play sounds from your gestures when EnableGestureSounds is false. (Useless otherwise)</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>

2
indra/newview/llfloateravatarlist.cpp
View File

@@ -69,7 +69,7 @@
/** /**
* @brief How long to keep people who are gone in the list and in memory. * @brief How long to keep people who are gone in the list and in memory.
*/ */
const F32 DEAD_KEEP_TIME = 10.0f; const F32 DEAD_KEEP_TIME = 0.5f;
extern U32 gFrameCount; extern U32 gFrameCount;

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

@@ -74,7 +74,7 @@ Hover your mouse over the options for more help.
(Owners are shown in bold) (Owners are shown in bold)
</text> </text>
<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-88" <name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-88"
column_padding="0" draw_border="true" draw_heading="true" column_padding="0" draw_border="true" draw_heading="true" multi_select="true"
follows="left|top" heading_font="SansSerifSmall" heading_height="14" follows="left|top" heading_font="SansSerifSmall" heading_height="14"
height="80" left="7" mouse_opaque="true" menu_file="menu_avs_list.xml" height="80" left="7" mouse_opaque="true" menu_file="menu_avs_list.xml"
name="visible_members" width="404"> name="visible_members" width="404">