From 55612611c679efda5d491944dee75f4768749277 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 30 May 2017 22:03:43 +0100
Subject: SL-694 - stub support for ObjectAnimation message type

---
 scripts/messages/message_template.msg      | 30 ++++++++++++++++++++++++++++--
 scripts/messages/message_template.msg.sha1 |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index c56eaae6fe..3185121a6e 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -8,7 +8,7 @@ version 2.0
 // for each type is listed below:
 // Low: 423
 // Medium: 18
-// High: 29
+// High: 30
 // PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE!
 
 
@@ -3571,7 +3571,6 @@ version 2.0
 	}
 
 }
-
 // AvatarAppearance - Update visual params
 {
 	AvatarAppearance Low 158 Trusted Zerocoded
@@ -7285,6 +7284,33 @@ version 2.0
 }
 
 
+// *************************************************************************
+// Object animation messages
+// *************************************************************************
+
+// Note this is basically identical to AvatarAnimation.
+// Needs to be a different message because existing viewers
+// have insufficiently smart handler functions.
+
+// ObjectAnimation - Update animation state
+// simulator --> viewer
+{
+        ObjectAnimation High 30 Trusted Unencoded
+        {
+                Sender                  Single
+                {       ID                      LLUUID  }
+        }
+        {
+                AnimationList Variable
+                { AnimID                LLUUID }
+                { AnimSequenceID S32 }
+        }
+        {
+                AnimationSourceList Variable
+                { ObjectID              LLUUID }
+        }
+}
+
 // *************************************************************************
 // Asset storage messages
 // *************************************************************************
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 5bc06ec042..88b84e29da 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-337f351910b0c8821cb3d447bc6578516a043c80
\ No newline at end of file
+428700550e70f611b632e3bb6422fe1d093a0313
\ No newline at end of file
-- 
cgit v1.3


From 74957676fc0b05825abc3af907241479f06fa8c3 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 5 Jun 2017 20:22:59 +0100
Subject: SL-694 - message changes for ObjectAnimation, more logging to
 validate behavior

---
 indra/newview/llviewermessage.cpp          | 23 +++++++++++------------
 scripts/messages/message_template.msg      |  4 ----
 scripts/messages/message_template.msg.sha1 |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'scripts')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6a6e932b4a..2b62ccd62f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5072,51 +5072,50 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 {
 	LLUUID	animation_id;
 	LLUUID	uuid;
-#if 0
 	S32		anim_sequence_id;
-#endif
 	
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
     LLViewerObject *objp = gObjectList.findObject(uuid);
     if (!objp)
     {
-		LL_WARNS("Messaging") << "Received animation state for unknown object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "AXON Received animation state for unknown object" << uuid << LL_ENDL;
         return;
     }
     
 	LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp);
     if (!volp)
     {
-		LL_WARNS("Messaging") << "Received animation state for non-volume object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "AXON Received animation state for non-volume object" << uuid << LL_ENDL;
         return;
     }
 
     if (!volp->isAnimatedMesh())
     {
-		LL_WARNS("Messaging") << "Received animation state for non-animated object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "AXON Received animation state for non-animated object" << uuid << LL_ENDL;
         return;
     }
 
-    LL_WARNS() << "ADD SUPPORT FOR OBJECT ANIMATION HERE" << LL_ENDL;
-#if 0
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList);
+	LL_WARNS() << "AXON handle object animation here, num_blocks " << num_blocks << LL_ENDL;
 
-	avatarp->mSignaledAnimations.clear();
+	//avatarp->mSignaledAnimations.clear();
+    volp->setDebugText(llformat("Animations %d", num_blocks));
 	
     for( S32 i = 0; i < num_blocks; i++ )
     {
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
-        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+        //avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+        LL_INFOS() << "AXON got object animation request for object " 
+                   << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
 	if (num_blocks)
 	{
-		avatarp->processAnimationStateChanges();
+        LL_INFOS() << "AXON process animation state changes here" << LL_ENDL;
+		//avatarp->processAnimationStateChanges();
 	}
-#endif
 }
 
 
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 3185121a6e..18264ee59c 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -7305,10 +7305,6 @@ version 2.0
                 { AnimID                LLUUID }
                 { AnimSequenceID S32 }
         }
-        {
-                AnimationSourceList Variable
-                { ObjectID              LLUUID }
-        }
 }
 
 // *************************************************************************
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 88b84e29da..db87ad5e77 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-428700550e70f611b632e3bb6422fe1d093a0313
\ No newline at end of file
+55df2c7135733c5da64ef8f01859b83a433a3a09
\ No newline at end of file
-- 
cgit v1.3


From 2af5332e46b3917d6dce211e576a92d04c3eda8b Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 30 Jun 2017 21:59:39 +0100
Subject: Added cycle_object_animations.lsl. Also change to test.cpp to see if
 it affects a g++ internal compiler error.

---
 indra/test/test.cpp                             |  2 -
 scripts/testing/lsl/cycle_object_animations.lsl | 53 +++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 scripts/testing/lsl/cycle_object_animations.lsl

(limited to 'scripts')

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 630af2b73b..e42374d56b 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -34,7 +34,6 @@
  *
  */
 
-
 #include "linden_common.h"
 #include "llerrorcontrol.h"
 #include "lltut.h"
@@ -685,5 +684,4 @@ int main(int argc, char **argv)
 	return retval;
 
 	//delete mycallback;
-
 }
diff --git a/scripts/testing/lsl/cycle_object_animations.lsl b/scripts/testing/lsl/cycle_object_animations.lsl
new file mode 100644
index 0000000000..95fa99a191
--- /dev/null
+++ b/scripts/testing/lsl/cycle_object_animations.lsl
@@ -0,0 +1,53 @@
+cycle_animations()
+{
+    list AnimationList;
+    integer count = llGetInventoryNumber(INVENTORY_ANIMATION);
+    string ItemName;
+    string NowPlaying;
+    while (count--)
+    {
+        ItemName = llGetInventoryName(INVENTORY_ANIMATION, count);
+        if (NowPlaying != "")
+        {
+            llSay(0, "Stopping " + NowPlaying);
+            llStopObjectAnimation(NowPlaying);
+        }
+        llSay(0, "Starting " + ItemName);
+        llStartObjectAnimation(ItemName);
+        NowPlaying = ItemName;
+        llSleep(10);
+    }
+    if (NowPlaying != "")
+    {
+        llSay(0, "Stopping " + NowPlaying);
+        llStopObjectAnimation(NowPlaying);
+        llSleep(10);
+    }
+}
+
+default
+{
+    state_entry()
+    {
+        llSay(0, "Animated Object here");
+    }
+
+    touch_start(integer total_number)
+    {
+        llSay(0, "Touch started.");
+        while (1)
+        {
+            cycle_animations();
+        }
+
+    }
+    
+    touch_end(integer total_number)
+    {
+        llSay(0, "Touch ended.");
+    }
+}
+
+// Local Variables:
+// shadow-file-name: "$SW_HOME/axon/scripts/testing/lsl/cycle_object_animations.lsl"
+// End:
-- 
cgit v1.3


From f55667397e75991348fa25b6ad581a36de99acf0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 6 Jul 2017 01:25:10 +0100
Subject: SL-722 - handle per-object animation requests, combine for control
 avatar animation state.

---
 indra/newview/app_settings/logcontrol.xml       |  1 +
 indra/newview/llcontrolavatar.cpp               | 64 +++++++++++++++++++++++++
 indra/newview/llcontrolavatar.h                 |  3 ++
 indra/newview/llviewermessage.cpp               | 13 ++---
 indra/newview/llvoavatar.cpp                    |  1 +
 indra/newview/llvovolume.h                      |  5 ++
 scripts/testing/lsl/cycle_object_animations.lsl |  6 +--
 7 files changed, 82 insertions(+), 11 deletions(-)

(limited to 'scripts')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index ecd7c4bc36..ddd07dba80 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -50,6 +50,7 @@
 						</array>
 					<key>tags</key>
 						<array>
+                          <string>AXON</string>
 						<!-- sample entry for debugging specific items	
 						     <string>Avatar</string>
 						     <string>Inventory</string>
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index bd99f66459..f18d1c636a 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -190,3 +190,67 @@ void LLControlAvatar::updateDebugText()
 
     LLVOAvatar::updateDebugText();
 }
+
+void LLControlAvatar::getAnimatedVolumes(std::vector<LLVOVolume*>& volumes)
+{
+    if (!mRootVolp)
+    {
+        return;
+    }
+
+    volumes.push_back(mRootVolp);
+    
+	LLViewerObject::const_child_list_t& child_list = mRootVolp->getChildren();
+	for (LLViewerObject::const_child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); ++iter)
+	{
+		LLViewerObject* childp = *iter;
+        LLVOVolume *child_volp = dynamic_cast<LLVOVolume*>(childp);
+        if (child_volp && child_volp->isAnimatedObject())
+        {
+            volumes.push_back(child_volp);
+        }
+    }
+}
+
+// This is called after an associated object receives an animation
+// message. Combine the signaled animations for all associated objects
+// and process any resulting state changes.
+void LLControlAvatar::updateAnimations()
+{
+    if (!mRootVolp)
+    {
+        LL_WARNS("AXON") << "No root vol" << LL_ENDL;
+        return;
+    }
+
+    std::vector<LLVOVolume*> volumes;
+    getAnimatedVolumes(volumes);
+    
+    // Rebuild mSignaledAnimations from the associated volumes.
+	std::map<LLUUID, S32> anims;
+    for (std::vector<LLVOVolume*>::iterator vol_it = volumes.begin(); vol_it != volumes.end(); ++vol_it)
+    {
+        LLVOVolume *volp = *vol_it;
+        for (std::map<LLUUID,S32>::iterator anim_it = volp->mObjectSignaledAnimations.begin();
+             anim_it != volp->mObjectSignaledAnimations.end();
+             ++anim_it)
+        {
+            std::map<LLUUID,S32>::iterator found_anim_it = anims.find(anim_it->first);
+            if (found_anim_it != anims.end())
+            {
+                // Animation already present, use the larger sequence id
+                anims[anim_it->first] = llmax(found_anim_it->second, anim_it->second);
+            }
+            else
+            {
+                // Animation not already present, use this sequence id.
+                anims[anim_it->first] = anim_it->second;
+            }
+        }
+    }
+    mSignaledAnimations = anims;
+
+    LL_DEBUGS("AXON") << "process animation state changes here" << LL_ENDL;
+    processAnimationStateChanges();
+}
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index fc7b4aa06d..1be2d58441 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -51,6 +51,9 @@ public:
     void markForDeath();
 
     virtual void idleUpdate(LLAgent &agent, const F64 &time);
+
+    void getAnimatedVolumes(std::vector<LLVOVolume*>& volumes);
+    void updateAnimations();  
     
 	virtual void	updateDebugText();
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 227c6afcb0..ba4c632586 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5112,22 +5112,19 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         avatarp->mPlaying = true;
 		avatarp->updateVolumeGeom();
     }
-	avatarp->mSignaledAnimations.clear();
+
+	volp->mObjectSignaledAnimations.clear();
 	
     for( S32 i = 0; i < num_blocks; i++ )
     {
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
-        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+        volp->mObjectSignaledAnimations[animation_id] = anim_sequence_id;
         LL_DEBUGS("AXON") << "got object animation request for object " 
-                   << uuid << " animation id " << animation_id << LL_ENDL;
+                          << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
-	if (num_blocks >= 0)
-	{
-        LL_DEBUGS("AXON") << "process animation state changes here" << LL_ENDL;
-		avatarp->processAnimationStateChanges();
-	}
+    avatarp->updateAnimations();
 }
 
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9a1629fbfb..b202f1b848 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -721,6 +721,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 
 	mCurrentGesticulationLevel = 0;
 
+    
 	mRuthTimer.reset();
 	mRuthDebugTimer.reset();
 	mDebugExistenceTimer.reset();
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 27a51d100f..3c0c9facb1 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -274,6 +274,11 @@ public:
     bool isAnimatedObjectStateConsistent() const;
     void updateAnimatedObjectState(LLViewerObject *old_parent, LLViewerObject *new_parent);
 
+    // AXON For animated objects, we need to track animations requested
+    // per-object, then reconcile those to manage the control avatar
+    // animation state.
+	std::map<LLUUID, S32> 					mObjectSignaledAnimations; // requested state of Animation name/value
+
     // Functions that deal with media, or media navigation
     
     // Update this object's media data with the given media data array
diff --git a/scripts/testing/lsl/cycle_object_animations.lsl b/scripts/testing/lsl/cycle_object_animations.lsl
index 95fa99a191..79c8ff4151 100644
--- a/scripts/testing/lsl/cycle_object_animations.lsl
+++ b/scripts/testing/lsl/cycle_object_animations.lsl
@@ -9,17 +9,17 @@ cycle_animations()
         ItemName = llGetInventoryName(INVENTORY_ANIMATION, count);
         if (NowPlaying != "")
         {
-            llSay(0, "Stopping " + NowPlaying);
+            //llSay(0, "Stopping " + NowPlaying);
             llStopObjectAnimation(NowPlaying);
         }
-        llSay(0, "Starting " + ItemName);
+        //llSay(0, "Starting " + ItemName);
         llStartObjectAnimation(ItemName);
         NowPlaying = ItemName;
         llSleep(10);
     }
     if (NowPlaying != "")
     {
-        llSay(0, "Stopping " + NowPlaying);
+        //llSay(0, "Stopping " + NowPlaying);
         llStopObjectAnimation(NowPlaying);
         llSleep(10);
     }
-- 
cgit v1.3


From 41f7f7a68ee3d9b3eee55437ef0ffcd1d0277227 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 14 Jul 2017 22:18:53 +0100
Subject: SL-751 - lsl scripts for control of animated objects within a region

---
 indra/newview/lltoolpie.cpp                     |   6 ++
 scripts/testing/lsl/axon_test_region_driver.lsl |  54 ++++++++++++
 scripts/testing/lsl/cycle_object_animations.lsl | 105 +++++++++++++++++++-----
 3 files changed, 145 insertions(+), 20 deletions(-)
 create mode 100644 scripts/testing/lsl/axon_test_region_driver.lsl

(limited to 'scripts')

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index fc052ae3aa..a1b3caf38b 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1764,6 +1764,12 @@ BOOL LLToolPie::handleRightClickPick()
 			{
 				return TRUE; // unexpected, but escape
 			}
+#if 0       // AXON TBD
+            if (object->asAvatar() && object->asAvatar()->isControlAvatar())
+            {
+				return TRUE; // control avatars are not people...
+            }
+#endif
 
 			// Object is an avatar, so check for mute by id.
 			LLVOAvatar* avatar = (LLVOAvatar*)object;
diff --git a/scripts/testing/lsl/axon_test_region_driver.lsl b/scripts/testing/lsl/axon_test_region_driver.lsl
new file mode 100644
index 0000000000..dfcbb9871a
--- /dev/null
+++ b/scripts/testing/lsl/axon_test_region_driver.lsl
@@ -0,0 +1,54 @@
+list buttons = ["anim start", "anim stop", " ", "verbose on", "verbose off", " "];
+string dialogInfo = "\nPlease make a choice.";
+ 
+key ToucherID;
+integer dialogChannel;
+integer listenHandle;
+integer commandChannel;
+ 
+default
+{
+    state_entry()
+    {
+        dialogChannel = -1 - (integer)("0x" + llGetSubString( (string)llGetKey(), -7, -1) );
+        commandChannel = -2001;
+    }
+ 
+    touch_start(integer num_detected)
+    {
+        ToucherID = llDetectedKey(0);
+        llListenRemove(listenHandle);
+        listenHandle = llListen(dialogChannel, "", ToucherID, "");
+        llDialog(ToucherID, dialogInfo, buttons, dialogChannel);
+        llSetTimerEvent(60.0); // Here we set a time limit for responses
+    }
+ 
+    listen(integer channel, string name, key id, string message)
+    {
+        if (message == "-")
+        {
+            llDialog(ToucherID, dialogInfo, buttons, dialogChannel);
+            return;
+        }
+ 
+        llListenRemove(listenHandle);
+        //  stop timer since the menu was clicked
+        llSetTimerEvent(0);
+
+        llOwnerSay("Sending message " + message + " on channel " + (string)commandChannel);
+        llRegionSay(commandChannel, message);
+    }
+ 
+    timer()
+    {
+    //  stop timer
+        llSetTimerEvent(0);
+ 
+        llListenRemove(listenHandle);
+        llWhisper(0, "Sorry. You snooze; you lose.");
+    }
+}
+
+// Local Variables:
+// shadow-file-name: "$SW_HOME/axon/scripts/testing/lsl/axon_test_region_driver.lsl"
+// End:
diff --git a/scripts/testing/lsl/cycle_object_animations.lsl b/scripts/testing/lsl/cycle_object_animations.lsl
index 79c8ff4151..e7a378889a 100644
--- a/scripts/testing/lsl/cycle_object_animations.lsl
+++ b/scripts/testing/lsl/cycle_object_animations.lsl
@@ -1,50 +1,115 @@
-cycle_animations()
+integer listenHandle; 
+integer verbose;
+integer current_animation_number;
+string NowPlaying;
+
+say_if_verbose(integer channel, string message)
+{
+    if (verbose)
+    {
+        llSay(0, message);
+    }
+}
+
+stop_all_animations()
 {
-    list AnimationList;
     integer count = llGetInventoryNumber(INVENTORY_ANIMATION);
     string ItemName;
     string NowPlaying;
     while (count--)
     {
         ItemName = llGetInventoryName(INVENTORY_ANIMATION, count);
-        if (NowPlaying != "")
-        {
-            //llSay(0, "Stopping " + NowPlaying);
-            llStopObjectAnimation(NowPlaying);
-        }
-        //llSay(0, "Starting " + ItemName);
-        llStartObjectAnimation(ItemName);
-        NowPlaying = ItemName;
-        llSleep(10);
+        say_if_verbose(0, "Stopping " + ItemName);
+        llStopObjectAnimation(ItemName);
     }
+}
+
+start_cycle_animations()
+{
+    current_animation_number = llGetInventoryNumber(INVENTORY_ANIMATION);
+    next_animation(); // Do first iteration without waiting for timer
+    llSetTimerEvent(5.0);
+}
+
+next_animation()
+{
+    string ItemName;
     if (NowPlaying != "")
     {
-        //llSay(0, "Stopping " + NowPlaying);
+        say_if_verbose(0, "Stopping " + NowPlaying);
         llStopObjectAnimation(NowPlaying);
-        llSleep(10);
     }
+    if (current_animation_number--)
+    {
+        ItemName = llGetInventoryName(INVENTORY_ANIMATION, current_animation_number);
+        say_if_verbose(0, "Starting " + ItemName);
+        llStartObjectAnimation(ItemName);
+        NowPlaying = ItemName;
+    }
+    else
+    {
+        // Start again at the top
+        current_animation_number = llGetInventoryNumber(INVENTORY_ANIMATION);
+    }
+}
+
+stop_cycle_animations()
+{
+    llSetTimerEvent(0);
 }
 
 default
 {
     state_entry()
     {
-        llSay(0, "Animated Object here");
+        say_if_verbose(0, "Animated Object here");
+        listenHandle = llListen(-2001,"","","");  
+        verbose = 0;
+
+        stop_all_animations();
     }
 
-    touch_start(integer total_number)
+    listen(integer channel, string name, key id, string message)
     {
-        llSay(0, "Touch started.");
-        while (1)
+        llOwnerSay("got message " + name + " " + (string) id + " " + message);
+        list words = llParseString2List(message,[" "],[]);
+        string command = llList2String(words,0);
+        string option = llList2String(words,1);
+        if (command=="anim")
+        {
+            stop_all_animations();
+            if (option=="start")
+            {
+                start_cycle_animations();
+            }
+            else if (option=="stop")
+            {
+                stop_cycle_animations();
+            }
+        }
+        if (command=="verbose")
         {
-            cycle_animations();
+            if (option=="on")
+            {
+                verbose = 1;
+            }
+            else if (option=="off")
+            {
+                verbose = 0;
+            }
         }
+    }
 
+    timer()
+    {
+        say_if_verbose(0, "timer triggered");
+        next_animation();
     }
     
-    touch_end(integer total_number)
+    touch_start(integer total_number)
     {
-        llSay(0, "Touch ended.");
+        say_if_verbose(0, "Touch started.");
+        start_cycle_animations();
     }
 }
 
-- 
cgit v1.3


From bbe5681d05d486d86f53d2adf3fa40b136c29df9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 20 Jul 2017 20:51:06 +0100
Subject: SL-751 - added test script move_in_circle_using_llSetRegionPos.lsl

---
 .../lsl/move_in_circle_using_llSetRegionPos.lsl    | 98 ++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl

(limited to 'scripts')

diff --git a/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl b/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
new file mode 100644
index 0000000000..5303b6f4f5
--- /dev/null
+++ b/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
@@ -0,0 +1,98 @@
+integer listenHandle; 
+integer verbose;
+integer num_steps = 50;
+float circle_time = 5.0;
+integer circle_step;
+vector circle_pos;
+vector circle_center;
+float circle_radius;
+
+start_circle(vector center, float radius)
+{
+    vector currentPosition = llGetPos();
+    circle_center = center;
+    circle_radius = radius;
+    circle_step = 0;
+    llSetTimerEvent(circle_time/num_steps);
+}
+
+stop_circle()
+{
+    llSetTimerEvent(0);
+    llSetRegionPos(circle_center);
+}
+
+next_circle()
+{
+    float rad = (circle_step * TWO_PI)/num_steps;
+    float x = circle_center.x + llCos(rad)*circle_radius;
+    float y = circle_center.y + llSin(rad)*circle_radius;
+    float z = circle_center.z;
+    llSetRegionPos(<x,y,z>);
+    circle_step = (circle_step+1)%num_steps;
+}
+
+circle_path(vector center, float radius)
+{
+    integer i;
+    integer num_steps = 50;
+    float circle_time = 5.0; // seconds
+    for (i=0; i<num_steps; ++i)
+    {
+        float rad = (i * TWO_PI)/num_steps;
+        float x = center.x + llCos(rad)*radius;
+        float y = center.y + llSin(rad)*radius;
+        float z = center.z;
+        llSetRegionPos(<x,y,z>);
+        llSleep(circle_time/num_steps);
+    }
+}
+
+default
+{
+    state_entry()
+    {
+        llSay(0, "Hello, Avatar!");
+        listenHandle = llListen(-2001,"","","");  
+        verbose = 0;
+    }
+
+    listen(integer channel, string name, key id, string message)
+    {
+        llOwnerSay("got message " + name + " " + (string) id + " " + message);
+        list words = llParseString2List(message,[" "],[]);
+        string command = llList2String(words,0);
+        string option = llList2String(words,1);
+        if (command=="anim")
+        {
+            if (option=="start")
+            {
+                start_circle(llGetPos(), 3.0);
+            }
+            else if (option=="stop")
+            {
+                stop_circle();
+            }
+        }
+        if (command=="verbose")
+        {
+            if (option=="on")
+            {
+                verbose = 1;
+            }
+            else if (option=="off")
+            {
+                verbose = 0;
+            }
+        }
+    }
+
+    timer()
+    {
+        next_circle();
+    }
+}
+
+// Local Variables:
+// shadow-file-name: "$SW_HOME/axon/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl"
+// End:
-- 
cgit v1.3


From 30880e062afa0671b166f161ae7c109bfd37d38f Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 21 Jul 2017 20:01:40 +0100
Subject: SL-751, SL-691 - test lsl scripts update, better syncing between
 skeleton and drawable

---
 indra/newview/lldrawable.cpp                       |  6 ++++
 indra/newview/llviewerobject.cpp                   |  4 ---
 scripts/testing/lsl/axon_test_region_driver.lsl    |  8 ++---
 .../lsl/move_in_circle_using_llSetRegionPos.lsl    | 39 +++++++++++-----------
 4 files changed, 29 insertions(+), 28 deletions(-)

(limited to 'scripts')

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 61ebf947dd..8001486b53 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -50,6 +50,7 @@
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
 #include "llvocache.h"
+#include "llcontrolavatar.h"
 
 const F32 MIN_INTERPOLATE_DISTANCE_SQUARED = 0.001f * 0.001f;
 const F32 MAX_INTERPOLATE_DISTANCE_SQUARED = 10.f * 10.f;
@@ -697,6 +698,11 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	mXform.setScale(LLVector3(1,1,1)); //no scale in drawable transforms (IT'S A RULE!)
 	mXform.updateMatrix();
 
+    if (mVObjp && mVObjp->isRootEdit() && mVObjp->getControlAvatar())
+    {
+        mVObjp->getControlAvatar()->matchVolumeTransform();
+    }
+    
 	if (mSpatialBridge)
 	{
 		gPipeline.markMoved(mSpatialBridge, FALSE);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index cb9f9e0455..e2fbac023a 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4062,10 +4062,6 @@ void LLViewerObject::setPosition(const LLVector3 &pos, BOOL damped)
 		// position caches need to be up to date on root objects
 		updatePositionCaches();
 	}
-    if (getControlAvatar() && isRootEdit())
-    {
-        getControlAvatar()->matchVolumeTransform();
-    }
 }
 
 void LLViewerObject::setPositionGlobal(const LLVector3d &pos_global, BOOL damped)
diff --git a/scripts/testing/lsl/axon_test_region_driver.lsl b/scripts/testing/lsl/axon_test_region_driver.lsl
index dfcbb9871a..dcf146a9cf 100644
--- a/scripts/testing/lsl/axon_test_region_driver.lsl
+++ b/scripts/testing/lsl/axon_test_region_driver.lsl
@@ -1,4 +1,4 @@
-list buttons = ["anim start", "anim stop", " ", "verbose on", "verbose off", " "];
+list buttons = ["anim start", "anim stop", "step", "verbose on", "verbose off", " "];
 string dialogInfo = "\nPlease make a choice.";
  
 key ToucherID;
@@ -20,7 +20,7 @@ default
         llListenRemove(listenHandle);
         listenHandle = llListen(dialogChannel, "", ToucherID, "");
         llDialog(ToucherID, dialogInfo, buttons, dialogChannel);
-        llSetTimerEvent(60.0); // Here we set a time limit for responses
+        //llSetTimerEvent(60.0); // Here we set a time limit for responses
     }
  
     listen(integer channel, string name, key id, string message)
@@ -35,7 +35,7 @@ default
         //  stop timer since the menu was clicked
         llSetTimerEvent(0);
 
-        llOwnerSay("Sending message " + message + " on channel " + (string)commandChannel);
+        //llOwnerSay("Sending message " + message + " on channel " + (string)commandChannel);
         llRegionSay(commandChannel, message);
     }
  
@@ -45,7 +45,7 @@ default
         llSetTimerEvent(0);
  
         llListenRemove(listenHandle);
-        llWhisper(0, "Sorry. You snooze; you lose.");
+        //llWhisper(0, "Sorry. You snooze; you lose.");
     }
 }
 
diff --git a/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl b/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
index 5303b6f4f5..fa12ab0588 100644
--- a/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
+++ b/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
@@ -1,6 +1,6 @@
 integer listenHandle; 
 integer verbose;
-integer num_steps = 50;
+integer num_steps = 12;
 float circle_time = 5.0;
 integer circle_step;
 vector circle_pos;
@@ -14,12 +14,21 @@ start_circle(vector center, float radius)
     circle_radius = radius;
     circle_step = 0;
     llSetTimerEvent(circle_time/num_steps);
+    llTargetOmega(<0.0, 0.0, 1.0>, TWO_PI/circle_time, 1.0);
 }
 
 stop_circle()
 {
     llSetTimerEvent(0);
-    llSetRegionPos(circle_center);
+    llTargetOmega(<0.0, 0.0, 1.0>, TWO_PI/circle_time, 0.0);
+    integer i;
+    for (i=0; i<10; i++)
+    {
+        vector new_pos = circle_center;
+        new_pos.x += llFrand(0.01);
+        llSetRegionPos(new_pos);
+        llSleep(0.1);
+    }
 }
 
 next_circle()
@@ -32,34 +41,19 @@ next_circle()
     circle_step = (circle_step+1)%num_steps;
 }
 
-circle_path(vector center, float radius)
-{
-    integer i;
-    integer num_steps = 50;
-    float circle_time = 5.0; // seconds
-    for (i=0; i<num_steps; ++i)
-    {
-        float rad = (i * TWO_PI)/num_steps;
-        float x = center.x + llCos(rad)*radius;
-        float y = center.y + llSin(rad)*radius;
-        float z = center.z;
-        llSetRegionPos(<x,y,z>);
-        llSleep(circle_time/num_steps);
-    }
-}
-
 default
 {
     state_entry()
     {
-        llSay(0, "Hello, Avatar!");
+        //llSay(0, "Hello, Avatar!");
         listenHandle = llListen(-2001,"","","");  
         verbose = 0;
+        circle_center = llGetPos();
     }
 
     listen(integer channel, string name, key id, string message)
     {
-        llOwnerSay("got message " + name + " " + (string) id + " " + message);
+        //llOwnerSay("got message " + name + " " + (string) id + " " + message);
         list words = llParseString2List(message,[" "],[]);
         string command = llList2String(words,0);
         string option = llList2String(words,1);
@@ -85,6 +79,11 @@ default
                 verbose = 0;
             }
         }
+        if (command=="step")
+        {
+            llSetTimerEvent(0);
+            next_circle();
+        }
     }
 
     timer()
-- 
cgit v1.3


From 22c8efc2ce8cac2056b73c504b95a9413fff8818 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 26 Jul 2017 18:56:18 +0100
Subject: SL-731, SL-751 - added debug option DebugAnimatedObjects, updated LSL
 test script

---
 indra/newview/app_settings/settings.xml            | 11 +++
 indra/newview/llcontrolavatar.cpp                  | 82 ++++++++++++++--------
 .../lsl/move_in_circle_using_llSetRegionPos.lsl    |  9 +--
 3 files changed, 63 insertions(+), 39 deletions(-)

(limited to 'scripts')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c544205df0..c8797f3f99 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2171,6 +2171,17 @@
       <key>Value</key>
       <string />
     </map>
+  <key>DebugAnimatedObjects</key>
+  <map>
+    <key>Comment</key>
+    <string>Show info related to animated objects</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>DebugAvatarAppearanceMessage</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index e9df81e255..8dfc2e81dc 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -31,6 +31,7 @@
 #include "pipeline.h"
 #include "llanimationstates.h"
 #include "llviewercontrol.h"
+#include "llmeshrepository.h"
 
 LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewerRegion* regionp) :
     LLVOAvatar(id, pcode, regionp),
@@ -49,6 +50,20 @@ LLControlAvatar::~LLControlAvatar()
 
 void LLControlAvatar::matchVolumeTransform()
 {
+    {
+        LLVolume *volume = mRootVolp->getVolume();
+        if (volume)
+        {
+            LLUUID mesh_id = volume->getParams().getSculptID();
+            const LLMeshSkinInfo* skin = gMeshRepo.getSkinInfo(mesh_id, mRootVolp);
+            if (skin)
+            {
+                LLMatrix4 bind_shape = skin->mBindShapeMatrix;
+                LL_INFOS("AXON") << "bind_shape is " << bind_shape << LL_ENDL;
+            }
+        }
+    }
+    
 	setPositionAgent(mRootVolp->getRenderPosition());
 	//slamPosition();
 
@@ -186,50 +201,55 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
 //virtual
 void LLControlAvatar::updateDebugText()
 {
-    S32 total_linkset_count = 0;
-    if (mRootVolp)
-    {
-        total_linkset_count = 1 + mRootVolp->getChildren().size();
-    }
-    std::vector<LLVOVolume*> volumes;
-    getAnimatedVolumes(volumes);
-    S32 animated_volume_count = volumes.size();
-    std::string active_string;
-    for (std::vector<LLVOVolume*>::iterator it = volumes.begin();
-         it != volumes.end(); ++it)
+	if (gSavedSettings.getBOOL("DebugAnimatedObjects"))
     {
-        LLVOVolume *volp = *it;
-        if (volp && volp->mDrawable)
+        S32 total_linkset_count = 0;
+        if (mRootVolp)
         {
-            if (volp->mDrawable->isActive())
+            total_linkset_count = 1 + mRootVolp->getChildren().size();
+        }
+        std::vector<LLVOVolume*> volumes;
+        getAnimatedVolumes(volumes);
+        S32 animated_volume_count = volumes.size();
+        std::string active_string;
+        for (std::vector<LLVOVolume*>::iterator it = volumes.begin();
+             it != volumes.end(); ++it)
+        {
+            LLVOVolume *volp = *it;
+            if (volp && volp->mDrawable)
             {
-                active_string += "A";
+                if (volp->mDrawable->isActive())
+                {
+                    active_string += "A";
+                }
+                else
+                {
+                    active_string += "S";
+                }
             }
             else
             {
-                active_string += "S";
+                active_string += "-";
             }
         }
-        else
-        {
-            active_string += "-";
-        }
-    }
-    addDebugText(llformat("CAV obj %d anim %d active %s",
-                          total_linkset_count, animated_volume_count, active_string.c_str()));
+        addDebugText(llformat("CAV obj %d anim %d active %s",
+                              total_linkset_count, animated_volume_count, active_string.c_str()));
+
 #if 0
-    // AXON - detailed rigged mesh info
-    for (std::vector<LLVOVolume*>::iterator it = volumes.begin();
-         it != volumes.end(); ++it)
-    {
-        LLRiggedVolume *rig_vol = (*it)->getRiggedVolume();
-        if (rig_vol)
+        // AXON - detailed rigged mesh info
+        for (std::vector<LLVOVolume*>::iterator it = volumes.begin();
+             it != volumes.end(); ++it)
         {
-            addDebugText(rig_vol->mExtraDebugText);
+            LLRiggedVolume *rig_vol = (*it)->getRiggedVolume();
+            if (rig_vol)
+            {
+                addDebugText(rig_vol->mExtraDebugText);
+            }
         }
-    }
 #endif
 
+    }
+
     LLVOAvatar::updateDebugText();
 }
 
diff --git a/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl b/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
index fa12ab0588..cc5b899b67 100644
--- a/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
+++ b/scripts/testing/lsl/move_in_circle_using_llSetRegionPos.lsl
@@ -21,14 +21,7 @@ stop_circle()
 {
     llSetTimerEvent(0);
     llTargetOmega(<0.0, 0.0, 1.0>, TWO_PI/circle_time, 0.0);
-    integer i;
-    for (i=0; i<10; i++)
-    {
-        vector new_pos = circle_center;
-        new_pos.x += llFrand(0.01);
-        llSetRegionPos(new_pos);
-        llSleep(0.1);
-    }
+    llSetRegionPos(circle_center);
 }
 
 next_circle()
-- 
cgit v1.3


From 936ccff59f2045f5747a0730570784608f39a7b4 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 31 Aug 2017 16:48:26 +0100
Subject: SL-751 - updated lsl test scripts with bug fix, added a version that
 uses the new command llGetObjectAnimationNames()

---
 scripts/testing/lsl/cycle_object_animations.lsl    |   4 +-
 scripts/testing/lsl/cycle_object_animations_v2.lsl | 133 +++++++++++++++++++++
 2 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 scripts/testing/lsl/cycle_object_animations_v2.lsl

(limited to 'scripts')

diff --git a/scripts/testing/lsl/cycle_object_animations.lsl b/scripts/testing/lsl/cycle_object_animations.lsl
index e7a378889a..46910e3656 100644
--- a/scripts/testing/lsl/cycle_object_animations.lsl
+++ b/scripts/testing/lsl/cycle_object_animations.lsl
@@ -7,7 +7,7 @@ say_if_verbose(integer channel, string message)
 {
     if (verbose)
     {
-        llSay(0, message);
+        llSay(channel, message);
     }
 }
 
@@ -71,7 +71,7 @@ default
 
     listen(integer channel, string name, key id, string message)
     {
-        llOwnerSay("got message " + name + " " + (string) id + " " + message);
+        //llOwnerSay("got message " + name + " " + (string) id + " " + message);
         list words = llParseString2List(message,[" "],[]);
         string command = llList2String(words,0);
         string option = llList2String(words,1);
diff --git a/scripts/testing/lsl/cycle_object_animations_v2.lsl b/scripts/testing/lsl/cycle_object_animations_v2.lsl
new file mode 100644
index 0000000000..60879fcce2
--- /dev/null
+++ b/scripts/testing/lsl/cycle_object_animations_v2.lsl
@@ -0,0 +1,133 @@
+integer listenHandle; 
+integer verbose;
+integer current_animation_number;
+string NowPlaying;
+
+say_if_verbose(integer channel, string message)
+{
+    if (verbose)
+    {
+        llSay(channel, message);
+    }
+}
+
+stop_all_animations()
+{
+    list curr_anims = llGetObjectAnimationNames();
+    say_if_verbose(0,"stopping all, curr_anims are " + (string) curr_anims);
+    integer length = llGetListLength(curr_anims);
+    integer index = 0;
+    while (index < length)
+    {
+        string anim = llList2String(curr_anims, index);
+        say_if_verbose(0, "Stopping " + anim);
+        llStopObjectAnimation(anim);
+        // This check isn't really needed, just included to demonstrate is_animation_running()
+        if (is_animation_running(anim))
+        {
+            say_if_verbose(0, "ERROR - failed to stop " + anim + "!");
+        }
+        ++index;
+    }
+}
+
+integer is_animation_running(string anim)
+{
+    list curr_anims = llGetObjectAnimationNames();
+    return ~llListFindList(curr_anims, (list)anim);
+}
+
+start_cycle_animations()
+{
+    current_animation_number = llGetInventoryNumber(INVENTORY_ANIMATION);
+    next_animation(); // Do first iteration without waiting for timer
+    llSetTimerEvent(5.0);
+}
+
+next_animation()
+{
+    string ItemName;
+    if (NowPlaying != "")
+    {
+        say_if_verbose(0, "Stopping " + NowPlaying);
+        llStopObjectAnimation(NowPlaying);
+    }
+    if (current_animation_number--)
+    {
+        ItemName = llGetInventoryName(INVENTORY_ANIMATION, current_animation_number);
+        say_if_verbose(0, "Starting " + ItemName);
+        llStartObjectAnimation(ItemName);
+        key anim_id = llGetInventoryKey(ItemName);
+        say_if_verbose(0, "Started item " + ItemName + " inv key " + (string) anim_id);
+        NowPlaying = ItemName;
+    }
+    else
+    {
+        // Start again at the top
+        current_animation_number = llGetInventoryNumber(INVENTORY_ANIMATION);
+    }
+}
+
+stop_cycle_animations()
+{
+    llSetTimerEvent(0);
+}
+
+default
+{
+    state_entry()
+    {
+        say_if_verbose(0, "Animated Object here");
+        listenHandle = llListen(-2001,"","","");  
+        verbose = 0;
+
+        stop_all_animations();
+    }
+
+    listen(integer channel, string name, key id, string message)
+    {
+        //llOwnerSay("got message " + name + " " + (string) id + " " + message);
+        list words = llParseString2List(message,[" "],[]);
+        string command = llList2String(words,0);
+        string option = llList2String(words,1);
+        if (command=="anim")
+        {
+            stop_all_animations();
+            if (option=="start")
+            {
+                start_cycle_animations();
+            }
+            else if (option=="stop")
+            {
+                stop_cycle_animations();
+            }
+        }
+        if (command=="verbose")
+        {
+            if (option=="on")
+            {
+                verbose = 1;
+            }
+            else if (option=="off")
+            {
+                verbose = 0;
+            }
+        }
+    }
+
+    timer()
+    {
+        say_if_verbose(0, "timer triggered");
+        next_animation();
+    }
+    
+    touch_start(integer total_number)
+    {
+        say_if_verbose(0, "Touch started.");
+        start_cycle_animations();
+    }
+}
+
+// Local Variables:
+// shadow-file-name: "$SW_HOME/axon/scripts/testing/lsl/cycle_object_animations_v2.lsl"
+// End:
-- 
cgit v1.3


From e4e4ad3c09bdc06f738f60bbfd7899036ad6553f Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 10 Sep 2018 20:13:35 +0100
Subject: SL-966 - animated object size/pos constraints cont, including some
 settings for debugging. additional options to anim_tool.py for making test
 animations

---
 indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++
 indra/newview/llcontrolavatar.cpp       | 24 ++++++++++++++++++------
 scripts/content_tools/anim_tool.py      | 30 ++++++++++++++++++++++++------
 3 files changed, 64 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0277d09ae1..3ad8b6cded 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2237,6 +2237,28 @@
     <key>Value</key>
     <real>1.00</real>
   </map>
+  <key>AnimatedObjectsMaxLegalOffset</key>
+  <map>
+    <key>Comment</key>
+    <string>Max visual offset between object position and rendered position</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>3.0</real>
+  </map>
+  <key>AnimatedObjectsMaxLegalSize</key>
+  <map>
+    <key>Comment</key>
+    <string>Max bounding box size for animated object's rendered position</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>64.0</real>
+  </map>
   <key>AvatarBoundingBoxComplexity</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 54b1a0dcaf..96cdb7f01d 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -74,6 +74,18 @@ void LLControlAvatar::initInstance()
 
 void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_scale_fixup) const
 {
+
+    F32 max_legal_offset = MAX_LEGAL_OFFSET;
+    if (gSavedSettings.getControl("AnimatedObjectsMaxLegalOffset"))
+    {
+        max_legal_offset = gSavedSettings.getF32("AnimatedObjectsMaxLegalOffset");
+    }
+    F32 max_legal_size = MAX_LEGAL_SIZE;
+    if (gSavedSettings.getControl("AnimatedObjectsMaxLegalSize"))
+    {
+        max_legal_size = gSavedSettings.getF32("AnimatedObjectsMaxLegalSize");
+    }
+    
     new_pos_fixup = LLVector3();
     new_scale_fixup = 1.0f;
     LLVector3 vol_pos = mRootVolp->getRenderPosition();
@@ -90,16 +102,16 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
         const LLVector3 *extents = getLastAnimExtents();
         LLVector3 box_dims = extents[1]-extents[0];
         F32 max_size = llmax(box_dims[0],box_dims[1],box_dims[2]);
-        LLVector3 pos_box_offset = point_to_box_offset(vol_pos, getLastAnimExtents());
+        LLVector3 pos_box_offset = point_to_box_offset(vol_pos, extents);
         F32 offset_dist = pos_box_offset.length();
-        if (offset_dist > MAX_LEGAL_OFFSET)
+        if (offset_dist > max_legal_offset)
         {
-            F32 target_dist = (offset_dist - MAX_LEGAL_OFFSET);
+            F32 target_dist = (offset_dist - max_legal_offset);
             new_pos_fixup = mPositionConstraintFixup + (target_dist/offset_dist)*pos_box_offset;
             LL_DEBUGS("ConstraintFix") << getFullname() << " pos fix, offset_dist " << offset_dist << " pos fixup " 
                                       << new_pos_fixup << " was " << mPositionConstraintFixup << LL_ENDL;
         }
-        else if (offset_dist < MAX_LEGAL_OFFSET-1 && mPositionConstraintFixup.length()>0.01f)
+        else if (offset_dist < max_legal_offset-1 && mPositionConstraintFixup.length()>0.01f)
         {
             new_pos_fixup = mPositionConstraintFixup * 0.9;
             LL_DEBUGS("ConstraintFix") << getFullname() << " pos fixup reduced " 
@@ -109,9 +121,9 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
         {
             new_pos_fixup = mPositionConstraintFixup;
         }
-        if (max_size/mScaleConstraintFixup > MAX_LEGAL_SIZE)
+        if (max_size/mScaleConstraintFixup > max_legal_size)
         {
-            new_scale_fixup = mScaleConstraintFixup*MAX_LEGAL_SIZE/max_size;
+            new_scale_fixup = mScaleConstraintFixup*max_legal_size/max_size;
             LL_DEBUGS("ConstraintFix") << getFullname() << " scale fix, max_size " << max_size << " fixup " 
                                       << mScaleConstraintFixup << " -> " << new_scale_fixup << LL_ENDL;
         }
diff --git a/scripts/content_tools/anim_tool.py b/scripts/content_tools/anim_tool.py
index 77bf731ae6..b7585112c5 100644
--- a/scripts/content_tools/anim_tool.py
+++ b/scripts/content_tools/anim_tool.py
@@ -524,11 +524,14 @@ if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(description="process SL animations")
     parser.add_argument("--verbose", help="verbose flag", action="store_true")
-    parser.add_argument("--dump", help="dump to specified file")
+    parser.add_argument("--dump", help="dump to stdout", action="store_true")
     parser.add_argument("--rot", help="specify sequence of rotations", type=float_triple, nargs="+")
-    parser.add_argument("--rand_pos", help="request random positions", action="store_true")
+    parser.add_argument("--rand_pos", help="request random positions within specified scale", type=float)
     parser.add_argument("--reset_pos", help="request original positions", action="store_true")
     parser.add_argument("--pos", help="specify sequence of positions", type=float_triple, nargs="+")
+    parser.add_argument("--duration", help="specify duration", type=float)
+    parser.add_argument("--loop_in", help="specify loop in time", type=float)
+    parser.add_argument("--loop_out", help="specify loop out time", type=float)
     parser.add_argument("--num_pos", help="number of positions to create", type=int, default=2)
     parser.add_argument("--delete_joints", help="specify joints to be deleted", nargs="+")
     parser.add_argument("--joints", help="specify joints to be added or modified", nargs="+")
@@ -572,15 +575,21 @@ if __name__ == "__main__":
             for name in joints:
                 anim.add_joint(name,0)
         if args.delete_joints:
-            for name in args.delete_joints:
+            del_joints = resolve_joints(args.delete_joints, skel_tree, lad_tree)
+            if args.verbose:
+                print "delete_joints resolved to",del_joints
+            for name in del_joints:
                 anim.delete_joint(name)
+                joints.remove(name)
         if joints and args.rot:
             anim.add_rot(joints, args.rot)
         if joints and args.pos:
             anim.add_pos(joints, args.pos)
-        if joints and args.rand_pos:
+        print "joints ",joints,"rand_pos",args.rand_pos,"num_pos",args.num_pos
+        if joints and args.rand_pos is not None:
+            print "rand_pos",args.rand_pos
             for joint in joints:
-                pos_array = list(tuple(random.uniform(-1,1) for i in xrange(3)) for j in xrange(args.num_pos))
+                pos_array = list(tuple(random.uniform(-args.rand_pos,args.rand_pos) for i in xrange(3)) for j in xrange(args.num_pos))
                 pos_array.append(pos_array[0])
                 anim.add_pos([joint], pos_array)
         if joints and args.reset_pos:
@@ -605,8 +614,17 @@ if __name__ == "__main__":
             print "set joint priority",args.joint_priority
             for joint in anim.joints:
                 joint.joint_priority = args.joint_priority
+        if args.duration is not None:
+            print "set duration",args.duration
+            anim.duration = args.duration
+        if args.loop_in is not None:
+            print "set loop_in",args.loop_in
+            anim.loop_in_point = args.loop_in
+        if args.loop_out is not None:
+            print "set loop_out",args.loop_out
+            anim.loop_out_point = args.loop_out
         if args.dump:
-            anim.dump(args.dump)
+            anim.dump("-")
         if args.summary:
             anim.summary()
         if args.outfilename:
-- 
cgit v1.3