diff options
author | UbitUmarov | 2014-08-14 12:34:07 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-14 12:34:07 +0100 |
commit | ca28062722cfa6f4a6221930ad4e988ae1ebeea6 (patch) | |
tree | ea54c09954c653a634f4fdbd7507462bec7b94da /OpenSim/Region | |
parent | reduced debug msgs (diff) | |
download | opensim-SC_OLD-ca28062722cfa6f4a6221930ad4e988ae1ebeea6.zip opensim-SC_OLD-ca28062722cfa6f4a6221930ad4e988ae1ebeea6.tar.gz opensim-SC_OLD-ca28062722cfa6f4a6221930ad4e988ae1ebeea6.tar.bz2 opensim-SC_OLD-ca28062722cfa6f4a6221930ad4e988ae1ebeea6.tar.xz |
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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 6 insertions, 2 deletions
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 | |||
4073 | 4073 | ||
4074 | // Throttles | 4074 | // Throttles |
4075 | float multiplier = 1; | 4075 | float multiplier = 1; |
4076 | |||
4077 | /* this is also used to send to new main regions not children | ||
4078 | |||
4076 | int childRegions = KnownRegionCount; | 4079 | int childRegions = KnownRegionCount; |
4077 | if (childRegions != 0) | 4080 | if (childRegions != 0) |
4078 | multiplier = 1f / childRegions; | 4081 | multiplier = 1f / childRegions; |
@@ -4080,7 +4083,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4080 | // Minimum throttle for a child region is 1/4 of the root region throttle | 4083 | // Minimum throttle for a child region is 1/4 of the root region throttle |
4081 | if (multiplier <= 0.25f) | 4084 | if (multiplier <= 0.25f) |
4082 | multiplier = 0.25f; | 4085 | multiplier = 0.25f; |
4083 | 4086 | */ | |
4084 | cAgent.Throttles = ControllingClient.GetThrottlesPacked(multiplier); | 4087 | cAgent.Throttles = ControllingClient.GetThrottlesPacked(multiplier); |
4085 | 4088 | ||
4086 | cAgent.HeadRotation = m_headrotation; | 4089 | cAgent.HeadRotation = m_headrotation; |
@@ -4094,7 +4097,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4094 | 4097 | ||
4095 | cAgent.AlwaysRun = SetAlwaysRun; | 4098 | cAgent.AlwaysRun = SetAlwaysRun; |
4096 | 4099 | ||
4097 | cAgent.Appearance = new AvatarAppearance(Appearance); | 4100 | // make clear we want the all thing |
4101 | cAgent.Appearance = new AvatarAppearance(Appearance,true,true); | ||
4098 | 4102 | ||
4099 | cAgent.ParentPart = ParentUUID; | 4103 | cAgent.ParentPart = ParentUUID; |
4100 | cAgent.SitOffset = PrevSitOffset; | 4104 | cAgent.SitOffset = PrevSitOffset; |