Applied patch by Ansariel Hiller for #689: Optionally disable internal hover (fly) up animation

2 files changed, 20 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 33299ba..ff90c86 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -364,6 +364,17 @@
     <key>Value</key>
     <integer>3</integer>
   </map>
+  <key>DisableInternalFlyUpAnimation</key>
+  <map>
+    <key>Comment</key>
+    <string>Disables the internal hover up animation. Enable if you use an AO and wear hand attachments like rings, prim nails etc. that often loose their correct position while flying.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>DisableLoginLogoutScreens</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 54aed54..6904bb2 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -5490,6 +5490,15 @@ void LLVOAvatar::resetAnimations()
 //-----------------------------------------------------------------------------
 BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
 {
+        // [Ansariel Hiller]: Disable pesky hover up animation that changes
+        //                    hand and finger position and often breaks correct
+        //                    fit of prim nails, rings etc. when flying and
+        //                    using an AO.
+        if ("62c5de58-cb33-5743-3d07-9e4cd4352864" == id.getString() && gSavedSettings.getBOOL("DisableInternalFlyUpAnimation"))
+        {
+                return TRUE;
+        }
+
         LLMemType mt(LLMemType::MTYPE_AVATAR);
 
         // start special case female walk for female avatars