aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authordiva2009-02-15 05:00:58 +0000
committerdiva2009-02-15 05:00:58 +0000
commit3d5a9e6748ef743c4db04b427d4d76ea65269618 (patch)
tree1877a66c0ca1f4caa455a7f98dd221897e687620 /OpenSim/Region/Framework/Scenes/Scene.cs
parentSet sculpt map alpha to 255 prior to scaling and meshing. Addresses Mantis #3150 (diff)
downloadopensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.zip
opensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.gz
opensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.bz2
opensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.xz
This started as way to correct Mantis #3158, which I believe should be fixed now. The flying status was temporarily being ignored, which caused the avie to drop sometimes -- there was a race condition. In the process it also fixes that annoying bug in basic physics where the avie would drop half-way to the ground upon region crossings (SetAppearance was missing). Additionally, a lot of child-agent-related code has been cleaned up; namely child agents are now consistently not added to physical scenes, and they also don't have appearances. All of that happens in MakeRoot, consistently.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 24cb48a..0f57b7c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2090,8 +2090,8 @@ namespace OpenSim.Region.Framework.Scenes
2090 /// <returns></returns> 2090 /// <returns></returns>
2091 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client) 2091 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client)
2092 { 2092 {
2093 AvatarAppearance appearance = null; 2093 AvatarAppearance appearance = new AvatarAppearance();
2094 GetAvatarAppearance(client, out appearance); 2094 //GetAvatarAppearance(client, out appearance);
2095 2095
2096 ScenePresence avatar = m_sceneGraph.CreateAndAddChildScenePresence(client, appearance); 2096 ScenePresence avatar = m_sceneGraph.CreateAndAddChildScenePresence(client, appearance);
2097 //avatar.KnownRegions = GetChildrenSeeds(avatar.UUID); 2097 //avatar.KnownRegions = GetChildrenSeeds(avatar.UUID);
@@ -2339,7 +2339,7 @@ namespace OpenSim.Region.Framework.Scenes
2339 } 2339 }
2340 2340
2341 // Don't disable this log message - it's too helpful 2341 // Don't disable this log message - it's too helpful
2342 m_log.DebugFormat( 2342 m_log.InfoFormat(
2343 "[CONNECTION BEGIN]: Region {0} told of incoming client {1} {2} {3} (circuit code {4})", 2343 "[CONNECTION BEGIN]: Region {0} told of incoming client {1} {2} {3} (circuit code {4})",
2344 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode); 2344 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
2345 2345
@@ -3295,7 +3295,7 @@ namespace OpenSim.Region.Framework.Scenes
3295 } 3295 }
3296 catch (Exception e) 3296 catch (Exception e)
3297 { 3297 {
3298 m_log.Info("[BUG]: " + e.ToString()); 3298 m_log.Info("[BUG] in " + RegionInfo.RegionName + ": " + e.ToString());
3299 } 3299 }
3300 } 3300 }
3301 } 3301 }