Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions indra/newview/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ set(viewer_SOURCE_FILES
fsfloateraddtocontactset.cpp
fsfavoritegroups.cpp
fsfloaterassetblacklist.cpp
fsfloateravataralign.cpp
fsfloateravatarrendersettings.cpp
fsfloaterblocklist.cpp
fsfloatercontacts.cpp
Expand Down Expand Up @@ -982,6 +983,7 @@ set(viewer_HEADER_FILES
fsfloaterim.h
fsfloaterimcontainer.h
fsfloaternearbychat.h
fsfloateravataralign.h
fsfloaterpartialinventory.h
fsfloaterplacedetails.h
fsfloaterposer.h
Expand Down
18 changes: 18 additions & 0 deletions indra/newview/app_settings/commands.xml
Original file line number Diff line number Diff line change
Expand Up @@ -689,4 +689,22 @@
is_running_parameters="omnifilter"
checkbox_control="OmnifilterEnabled"
/>

<command name="avatar_align"
available_in_toybox="true"
icon="Command_AvatarAlign_Icon"
label_ref="Command_AvatarAlign_Label"
tooltip_ref="Command_AvatarAlign_Tooltip"
execute_function="Avatar.AlignToggle"
is_running_function="Avatar.AlignIsOpen"
/>

<command name="face_nearest_avatar"
available_in_toybox="true"
icon="Command_FaceNearest_Icon"
label_ref="Command_FaceNearest_Label"
tooltip_ref="Command_FaceNearest_Tooltip"
execute_function="Avatar.FaceNearest"
/>

</commands>
11 changes: 11 additions & 0 deletions indra/newview/app_settings/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2252,6 +2252,17 @@
<key>Value</key>
<string>https://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/vawp/index.html</string>
</map>
<key>AvatarAlignMini</key>
<map>
<key>Comment</key>
<string>Use the compact mini compass floater instead of the full compass.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<!--AvatarBakedTextureUploadTimeout is in use by QA-->
<key>AvatarBakedTextureUploadTimeout</key>
<map>
Expand Down
Loading