diff options
| author | UbitUmarov | 2016-12-10 02:03:00 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-10 02:03:00 +0000 |
| commit | f57403909f36fe6cc46d2ee4cc8c9cd59e6aacf3 (patch) | |
| tree | c1c801865f2e9a213c8677464c49568093c5f9e3 | |
| parent | HG regions URI need to include also the default ports for compatibility (diff) | |
| download | opensim-SC_OLD-f57403909f36fe6cc46d2ee4cc8c9cd59e6aacf3.zip opensim-SC_OLD-f57403909f36fe6cc46d2ee4cc8c9cd59e6aacf3.tar.gz opensim-SC_OLD-f57403909f36fe6cc46d2ee4cc8c9cd59e6aacf3.tar.bz2 opensim-SC_OLD-f57403909f36fe6cc46d2ee4cc8c9cd59e6aacf3.tar.xz | |
do not try xbakes on HG
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 2cf0e9d..d501b7f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2125,11 +2125,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2125 | if (!gotCrossUpdate && !isNPC) | 2125 | if (!gotCrossUpdate && !isNPC) |
| 2126 | Scene.SendLayerData(ControllingClient); | 2126 | Scene.SendLayerData(ControllingClient); |
| 2127 | 2127 | ||
| 2128 | // HG delay | 2128 | // HG |
| 2129 | if((m_teleportFlags & TeleportFlags.ViaHGLogin) != 0) | 2129 | bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0; |
| 2130 | if(isHGTP) | ||
| 2130 | { | 2131 | { |
| 2131 | Thread.Sleep(500); | 2132 | // ControllingClient.SendNameReply(m_uuid, Firstname, Lastname); |
| 2132 | m_log.DebugFormat("[CompleteMovement] HG delay: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | 2133 | m_log.DebugFormat("[CompleteMovement] HG"); |
| 2133 | } | 2134 | } |
| 2134 | 2135 | ||
| 2135 | m_previusParcelHide = false; | 2136 | m_previusParcelHide = false; |
| @@ -2151,7 +2152,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2151 | cachedbaked = true; | 2152 | cachedbaked = true; |
| 2152 | else | 2153 | else |
| 2153 | { | 2154 | { |
| 2154 | if (m_scene.AvatarFactory != null) | 2155 | if (m_scene.AvatarFactory != null && !isHGTP) |
| 2155 | cachedbaked = m_scene.AvatarFactory.ValidateBakedTextureCache(this); | 2156 | cachedbaked = m_scene.AvatarFactory.ValidateBakedTextureCache(this); |
| 2156 | 2157 | ||
| 2157 | // not sure we need this | 2158 | // not sure we need this |