Skip to content

Commit e8bd502

Browse files
authored
Merge pull request #208 from AyaneStorm/pr-feat-compass-and-avatar-alignment
Floater that shows a compass, adds ability to face towards nearest avatar or given cardinal point
2 parents f0c8747 + 4d94329 commit e8bd502

24 files changed

Lines changed: 1039 additions & 1 deletion

indra/newview/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ set(viewer_SOURCE_FILES
116116
fsfloateraddtocontactset.cpp
117117
fsfavoritegroups.cpp
118118
fsfloaterassetblacklist.cpp
119+
fsfloateravataralign.cpp
119120
fsfloateravatarrendersettings.cpp
120121
fsfloaterblocklist.cpp
121122
fsfloatercontacts.cpp
@@ -987,6 +988,7 @@ set(viewer_HEADER_FILES
987988
fsfloaterim.h
988989
fsfloaterimcontainer.h
989990
fsfloaternearbychat.h
991+
fsfloateravataralign.h
990992
fsfloaterpartialinventory.h
991993
fsfloaterplacedetails.h
992994
fsfloaterposer.h

indra/newview/app_settings/commands.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,4 +689,22 @@
689689
is_running_parameters="omnifilter"
690690
checkbox_control="OmnifilterEnabled"
691691
/>
692+
693+
<command name="avatar_align"
694+
available_in_toybox="true"
695+
icon="Command_AvatarAlign_Icon"
696+
label_ref="Command_AvatarAlign_Label"
697+
tooltip_ref="Command_AvatarAlign_Tooltip"
698+
execute_function="Avatar.AlignToggle"
699+
is_running_function="Avatar.AlignIsOpen"
700+
/>
701+
702+
<command name="face_nearest_avatar"
703+
available_in_toybox="true"
704+
icon="Command_FaceNearest_Icon"
705+
label_ref="Command_FaceNearest_Label"
706+
tooltip_ref="Command_FaceNearest_Tooltip"
707+
execute_function="Avatar.FaceNearest"
708+
/>
709+
692710
</commands>

indra/newview/app_settings/settings.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,6 +2252,17 @@
22522252
<key>Value</key>
22532253
<string>https://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/vawp/index.html</string>
22542254
</map>
2255+
<key>AvatarAlignMini</key>
2256+
<map>
2257+
<key>Comment</key>
2258+
<string>Use the compact mini compass floater instead of the full compass.</string>
2259+
<key>Persist</key>
2260+
<integer>1</integer>
2261+
<key>Type</key>
2262+
<string>Boolean</string>
2263+
<key>Value</key>
2264+
<integer>0</integer>
2265+
</map>
22552266
<!--AvatarBakedTextureUploadTimeout is in use by QA-->
22562267
<key>AvatarBakedTextureUploadTimeout</key>
22572268
<map>

0 commit comments

Comments
 (0)