diff options
author | UbitUmarov | 2019-01-02 16:44:13 +0000 |
---|---|---|
committer | UbitUmarov | 2019-01-02 16:44:13 +0000 |
commit | b24c669c16d574a30a856839dd5fcbf8c1d4eabe (patch) | |
tree | 18ae9d8ecea72c9c20edf4fb7352a8b3b27aab95 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | mantis 8438: work around null ref (diff) | |
download | opensim-SC-b24c669c16d574a30a856839dd5fcbf8c1d4eabe.zip opensim-SC-b24c669c16d574a30a856839dd5fcbf8c1d4eabe.tar.gz opensim-SC-b24c669c16d574a30a856839dd5fcbf8c1d4eabe.tar.bz2 opensim-SC-b24c669c16d574a30a856839dd5fcbf8c1d4eabe.tar.xz |
more on the hack (runprebuild)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 527f12e..3b78f2d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -45,7 +45,6 @@ using OpenSim.Region.PhysicsModules.SharedBase; | |||
45 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 45 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
46 | using OpenSim.Services.Interfaces; | 46 | using OpenSim.Services.Interfaces; |
47 | using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags; | 47 | using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags; |
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
49 | 48 | ||
50 | namespace OpenSim.Region.Framework.Scenes | 49 | namespace OpenSim.Region.Framework.Scenes |
51 | { | 50 | { |
@@ -1111,14 +1110,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1111 | 1110 | ||
1112 | HealRate = 0.5f; | 1111 | HealRate = 0.5f; |
1113 | 1112 | ||
1114 | ControllingClient.SupportObjectAnimations = false; | ||
1115 | if (m_scene.CapsModule != null) | ||
1116 | { | ||
1117 | Caps cap = m_scene.CapsModule.GetCapsForUser(ControllingClient.CircuitCode); | ||
1118 | if (cap != null && (cap.Flags & Caps.CapsFlags.ObjectAnim) != 0) | ||
1119 | ControllingClient.SupportObjectAnimations = true; | ||
1120 | } | ||
1121 | |||
1122 | IConfig sconfig = m_scene.Config.Configs["EntityTransfer"]; | 1113 | IConfig sconfig = m_scene.Config.Configs["EntityTransfer"]; |
1123 | if (sconfig != null) | 1114 | if (sconfig != null) |
1124 | { | 1115 | { |
@@ -1142,7 +1133,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1142 | } | 1133 | } |
1143 | m_bandwidthBurst = m_bandwidth / 5; | 1134 | m_bandwidthBurst = m_bandwidth / 5; |
1144 | ControllingClient.RefreshGroupMembership(); | 1135 | ControllingClient.RefreshGroupMembership(); |
1145 | |||
1146 | } | 1136 | } |
1147 | 1137 | ||
1148 | private float lastHealthSent = 0; | 1138 | private float lastHealthSent = 0; |