diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 75dd3d1155..1653304edf 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -166,6 +166,7 @@ //#include "llfloaterimnearbychat.h #include "fsfloaternearbychat.h" // [FS communication UI] +#include "fsfloaterposer.h" // [FIRE-30873]: Poser #include "llpanelblockedlist.h" #include "llpanelprofileclassifieds.h" #include "llpanelemojicomplete.h" @@ -517,6 +518,7 @@ void LLViewerFloaterReg::registerFloaters() //LLFloaterReg::add("performance", "floater_performance.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("perms_default", "floater_perms_default.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); + LLFloaterReg::add("poser", "floater_poser.xml", (LLFloaterBuildFunc) &LLFloaterReg::build); // [FIRE-30873]: Poser LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // LLFloaterReg::add("prefs_graphics_advanced", "floater_preferences_graphics_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("prefs_view_advanced", "floater_preferences_view_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); diff --git a/indra/newview/skins/default/xui/en/floater_poser.xml b/indra/newview/skins/default/xui/en/floater_poser.xml new file mode 100644 index 0000000000..212049422a --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_poser.xml @@ -0,0 +1,1195 @@ + + + Inv_BodyShape + + Inv_Object + + + Body + Forehead/Brows + Eyes/Eye Lids + Cheeks/Lips + Left Hand + Left Arm + Right Hand + Right Arm + Legs + Tail + Hind Limbs + Wings + + + Whole Avatar + Torso + Chest + Neck + Head + Right Eye + Left Eye + Forehead Left Side + Forehead Right Side + Eyebrow Outer Left + Eyebrow Middle Left + Eyebrow Inner Left + Eyebrow Outer Right + Eyebrow Middle Right + Eyebrow Inner Right + EyeLid Upper Left + EyeLid Lower Left + EyeLid Upper Right + EyeLid Lower Left + Ear Upper Left + Ear Lower Left + Ear Upper Right + Ear Lower Right + Nose Left + Nose Center + Nose Right + Cheek Lower Left + Cheek Upper Left + Cheek Lower Right + Cheek Upper Right + Jaw + Teeth Lower + Lip Lower Left + Lip Lower Right + Lip Lower Middle + Tongue Base + Tongue Tip + Jaw Shaper + Forehead Middle + Nose Base + Teeth Upper + Lip Upper Left + Lip Upper Right + Lip Corner Left + Lip Corner Right + Lip Upper Center + Eye corner Inner Left + Eye corner Inner Right + Nose Bridge + Collar + Shoulder + Elbow + Wrist + Middle Finger Base + Middle Finger Mid + Middle Finger Tip + Index Finger Base + Index Finger Mid + Index Finger Tip + Ring Finger Base + Ring Finger Mid + Index Finger Tip + Pinky Finger Base + Pinky Finger Mid + Pinky Finger Tip + Thumb Base + Thumb Mid + Thumb Tip + Collar Bone + Shoulder + Elbow + Wrist + Middle Finger Base + Middle Finger Mid + Middle Finger Tip + Index Finger Base + Index Finger Mid + Index Finger Tip + Ring Finger Base + Ring Finger Mid + Ring Finger Tip + Pinky Finger Base + Pinky Finger Mid + Pinky Finger Tip + Thumb Base + Thumb Mid + Thumb Tip + Root + Left 1 + Left 2 + Left 3 + Left 4 + Left Fan + Right 1 + Right 2 + Right 3 + Right 4 + Right Fan + Right Hip + Right Knee + Right Ankle + Right Foot + Right Toe + Left Hip + Left Knee + Left Ankle + Left Foot + Left Toe + Tail Base + Tail 2 + Tail 3 + Tail 4 + Tail 5 + Tail Tip + Groin + Root + Left Base + Left 2 + Left 3 + Left 4 + Right Base + Right 2 + Right 3 + Right 4 + + + + + + + + + + + + + + + + + Up/Down: + + + + Left/Right: + + + + In/Out: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Rotation: + + + + + + + Azimuth: + + Elevation: + + Roll: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_poser_joints.xml b/indra/newview/skins/default/xui/en/menu_poser_joints.xml new file mode 100644 index 0000000000..59d4fe2710 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_poser_joints.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_poser_poses.xml b/indra/newview/skins/default/xui/en/menu_poser_poses.xml new file mode 100644 index 0000000000..701f0766f5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_poser_poses.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_poser_poses_btn.xml b/indra/newview/skins/default/xui/en/menu_poser_poses_btn.xml new file mode 100644 index 0000000000..17373f0c69 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_poser_poses_btn.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +