summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/commands.xml48
-rwxr-xr-xindra/newview/app_settings/settings.xml15
-rwxr-xr-xindra/newview/app_settings/settings_per_account.xml11
-rwxr-xr-xindra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl13
4 files changed, 80 insertions, 7 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 60c942094a..ce878f156b 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -3,6 +3,8 @@
<command name="aboutland"
available_in_toybox="true"
icon="Command_AboutLand_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_AboutLand_Label"
tooltip_ref="Command_AboutLand_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -13,6 +15,8 @@
<command name="appearance"
available_in_toybox="true"
icon="Command_Appearance_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Appearance_Label"
tooltip_ref="Command_Appearance_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -23,6 +27,8 @@
<command name="avatar"
available_in_toybox="true"
icon="Command_Avatar_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Avatar_Label"
tooltip_ref="Command_Avatar_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -33,6 +39,8 @@
<command name="build"
available_in_toybox="true"
icon="Command_Build_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Build_Label"
tooltip_ref="Command_Build_Tooltip"
execute_function="Build.Toggle"
@@ -46,6 +54,8 @@
available_in_toybox="true"
is_flashing_allowed="true"
icon="Command_Chat_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Chat_Label"
tooltip_ref="Command_Conversations_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -56,6 +66,8 @@
<command name="compass"
available_in_toybox="false"
icon="Command_Compass_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Compass_Label"
tooltip_ref="Command_Compass_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -66,6 +78,8 @@
<command name="destinations"
available_in_toybox="true"
icon="Command_Destinations_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Destinations_Label"
tooltip_ref="Command_Destinations_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -76,6 +90,8 @@
<command name="gestures"
available_in_toybox="true"
icon="Command_Gestures_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Gestures_Label"
tooltip_ref="Command_Gestures_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -86,6 +102,8 @@
<command name="howto"
available_in_toybox="true"
icon="Command_HowTo_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_HowTo_Label"
tooltip_ref="Command_HowTo_Tooltip"
execute_function="Help.ToggleHowTo"
@@ -94,6 +112,8 @@
<command name="inventory"
available_in_toybox="true"
icon="Command_Inventory_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Inventory_Label"
tooltip_ref="Command_Inventory_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -104,6 +124,8 @@
<command name="map"
available_in_toybox="true"
icon="Command_Map_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Map_Label"
tooltip_ref="Command_Map_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -114,6 +136,8 @@
<command name="marketplace"
available_in_toybox="false"
icon="Command_Marketplace_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Marketplace_Label"
tooltip_ref="Command_Marketplace_Tooltip"
execute_function="Avatar.OpenMarketplace"
@@ -121,6 +145,8 @@
<command name="minimap"
available_in_toybox="true"
icon="Command_MiniMap_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_MiniMap_Label"
tooltip_ref="Command_MiniMap_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -131,6 +157,8 @@
<command name="move"
available_in_toybox="true"
icon="Command_Move_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Move_Label"
tooltip_ref="Command_Move_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -141,6 +169,8 @@
<command name="outbox"
available_in_toybox="false"
icon="Command_Outbox_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Outbox_Label"
tooltip_ref="Command_Outbox_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -151,6 +181,8 @@
<command name="people"
available_in_toybox="true"
icon="Command_People_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_People_Label"
tooltip_ref="Command_People_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -161,6 +193,8 @@
<command name="picks"
available_in_toybox="true"
icon="Command_Picks_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Picks_Label"
tooltip_ref="Command_Picks_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -171,6 +205,8 @@
<command name="places"
available_in_toybox="true"
icon="Command_Places_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Places_Label"
tooltip_ref="Command_Places_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -181,6 +217,8 @@
<command name="preferences"
available_in_toybox="true"
icon="Command_Preferences_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Preferences_Label"
tooltip_ref="Command_Preferences_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -191,6 +229,8 @@
<command name="profile"
available_in_toybox="true"
icon="Command_Profile_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Profile_Label"
tooltip_ref="Command_Profile_Tooltip"
execute_function="Avatar.ToggleMyProfile"
@@ -199,6 +239,8 @@
<command name="search"
available_in_toybox="true"
icon="Command_Search_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Search_Label"
tooltip_ref="Command_Search_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -209,6 +251,8 @@
<command name="snapshot"
available_in_toybox="true"
icon="Command_Snapshot_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Snapshot_Label"
tooltip_ref="Command_Snapshot_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@@ -229,6 +273,8 @@
<command name="speak"
available_in_toybox="true"
icon="Command_Speak_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Speak_Label"
tooltip_ref="Command_Speak_Tooltip"
execute_function="Agent.PressMicrophone"
@@ -243,6 +289,8 @@
<command name="view"
available_in_toybox="true"
icon="Command_View_Icon"
+ hover_icon_unselected="Command_Highlighting_Icon"
+ hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_View_Label"
tooltip_ref="Command_View_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 41aac583d7..d9093c2a6d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5942,6 +5942,17 @@
<key>Value</key>
<real>1.6</real>
</map>
+ <key>MaxPersistentNotifications</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum amount of persistent notifications</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <real>250</real>
+ </map>
<key>MaxSelectDistance</key>
<map>
<key>Comment</key>
@@ -9850,7 +9861,7 @@
<key>RenderUseVAO</key>
<map>
<key>Comment</key>
- <string>[EXPERIMENTAL] Use GL Vertex Array Objects</string>
+ <string>[EXPERIMENTAL] Use GL Vertex Array Objects.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -13334,7 +13345,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>-1</string>
+ <string>0</string>
</map>
<key>VivoxDebugSIPURIHostName</key>
<map>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 636caf5ef3..500151c935 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -77,6 +77,17 @@
<key>Value</key>
<integer>412</integer>
</map>
+ <key>ConversationsParticipantListCollapsed</key>
+ <map>
+ <key>Comment</key>
+ <string>Stores the expanded/collapsed state of Nearby chat participant list</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>true</integer>
+ </map>
<key>InstantMessageLogPath</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index 271947b2dd..39632d0cef 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -34,14 +34,17 @@ mat4 getObjectSkinnedTransform()
vec4 w = fract(weight4);
vec4 index = floor(weight4);
+
+ index = min(index, vec4(31.0));
+ index = max(index, vec4( 0.0));
float scale = 1.0/(w.x+w.y+w.z+w.w);
w *= scale;
-
- mat4 mat = matrixPalette[int(index.x)]*w.x;
- mat += matrixPalette[int(index.y)]*w.y;
- mat += matrixPalette[int(index.z)]*w.z;
- mat += matrixPalette[int(index.w)]*w.w;
+
+ mat4 mat = matrixPalette[int(index.x)]*w.x;
+ mat += matrixPalette[int(index.y)]*w.y;
+ mat += matrixPalette[int(index.z)]*w.z;
+ mat += matrixPalette[int(index.w)]*w.w;
return mat;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 05:49:28 +0000