From ca28062722cfa6f4a6221930ad4e988ae1ebeea6 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 14 Aug 2014 12:34:07 +0100
Subject: dont mess with Throttles in code also used to send to main regions.
 Use full parameters on appearance cloning so its clear we want it all

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 67a33ae..0f67d07 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4073,6 +4073,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Throttles 
             float multiplier = 1;
+
+/* this is also used to send to new main regions not children
+ 
             int childRegions = KnownRegionCount;
             if (childRegions != 0)
                 multiplier = 1f / childRegions;
@@ -4080,7 +4083,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Minimum throttle for a child region is 1/4 of the root region throttle
             if (multiplier <= 0.25f)
                 multiplier = 0.25f;
-
+*/
             cAgent.Throttles = ControllingClient.GetThrottlesPacked(multiplier);
 
             cAgent.HeadRotation = m_headrotation;
@@ -4094,7 +4097,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             cAgent.AlwaysRun = SetAlwaysRun;
 
-            cAgent.Appearance = new AvatarAppearance(Appearance);
+            // make clear we want the all thing
+            cAgent.Appearance = new AvatarAppearance(Appearance,true,true);
 
             cAgent.ParentPart = ParentUUID;
             cAgent.SitOffset = PrevSitOffset;
-- 
cgit v1.1