OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
avinationmerge
UbitUmarov 2014-08-14 12:34:07 +01:00
parent 96cc4e5b95
commit ca28062722
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -4073,6 +4073,9 @@ namespace OpenSim.Region.Framework.Scenes
// Throttles // Throttles
float multiplier = 1; float multiplier = 1;
/* this is also used to send to new main regions not children
int childRegions = KnownRegionCount; int childRegions = KnownRegionCount;
if (childRegions != 0) if (childRegions != 0)
multiplier = 1f / childRegions; 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 // Minimum throttle for a child region is 1/4 of the root region throttle
if (multiplier <= 0.25f) if (multiplier <= 0.25f)
multiplier = 0.25f; multiplier = 0.25f;
*/
cAgent.Throttles = ControllingClient.GetThrottlesPacked(multiplier); cAgent.Throttles = ControllingClient.GetThrottlesPacked(multiplier);
cAgent.HeadRotation = m_headrotation; cAgent.HeadRotation = m_headrotation;
@ -4094,7 +4097,8 @@ namespace OpenSim.Region.Framework.Scenes
cAgent.AlwaysRun = SetAlwaysRun; 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.ParentPart = ParentUUID;
cAgent.SitOffset = PrevSitOffset; cAgent.SitOffset = PrevSitOffset;