diff -Nur opensim-/OpenSim/Framework/Capabilities/Caps.cs opensim/OpenSim/Framework/Capabilities/Caps.cs --- opensim-/OpenSim/Framework/Capabilities/Caps.cs 2009-09-02 15:20:09.000000000 +0900 +++ opensim/OpenSim/Framework/Capabilities/Caps.cs 2009-09-02 15:22:33.000000000 +0900 @@ -208,7 +208,8 @@ // As of RC 1.22.9 of the Linden client this is // supported - m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest); + // deleted by Fumi.Iseki for Inventory Icon of 1.23.4 + //m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest); // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires diff -Nur opensim-/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs opensim/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs --- opensim-/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs 2009-09-02 15:20:09.000000000 +0900 +++ opensim/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs 2009-09-02 15:22:33.000000000 +0900 @@ -257,7 +257,14 @@ item.TickCount = Environment.TickCount; item.Identifier = id; item.Resends = 0; - item.Length = packet.Length; + + // by Fumi.Iseki + try { + item.Length = packet.Length; + } + catch (Exception e) { + item.Length = 0; + } item.Sequence = packet.Header.Sequence; m_PacketQueue.Enqueue(item); diff -Nur opensim-/OpenSim/Region/Framework/Scenes/Scene.cs opensim/OpenSim/Region/Framework/Scenes/Scene.cs --- opensim-/OpenSim/Region/Framework/Scenes/Scene.cs 2009-09-02 15:20:09.000000000 +0900 +++ opensim/OpenSim/Region/Framework/Scenes/Scene.cs 2009-09-02 15:22:33.000000000 +0900 @@ -415,10 +415,10 @@ StatsReporter.SetObjectCapacity(objectCapacity); - m_simulatorVersion = simulatorVersion - + " (OS " + Util.GetOperatingSystemInformation() + ")" - + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() - + " PhysPrim:" + m_physicalPrim.ToString(); + m_simulatorVersion = simulatorVersion; + // + " (OS " + Util.GetOperatingSystemInformation() + ")" + // + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + // + " PhysPrim:" + m_physicalPrim.ToString(); try { diff -Nur opensim-/OpenSim/Region/Framework/Scenes/ScenePresence.cs opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs --- opensim-/OpenSim/Region/Framework/Scenes/ScenePresence.cs 2009-09-02 15:20:09.000000000 +0900 +++ opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs 2009-09-02 15:22:33.000000000 +0900 @@ -771,6 +771,17 @@ // related to the handling of attachments //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); + // Fumi.Iseki + if (pos.X < 0 || pos.X >= (int)Constants.RegionSize || pos.Y < 0 || pos.Y >= (int)Constants.RegionSize || pos.Z < 0) { + m_log.WarnFormat("[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}.", pos, Name, UUID); + + if (pos.X < 0) pos.X = 0; + else if (pos.X >= (int)Constants.RegionSize) pos.X = (int)Constants.RegionSize - 1; + if (pos.Y < 0) pos.Y = 0; + else if (pos.Y >= (int)Constants.RegionSize) pos.Y = (int)Constants.RegionSize - 1; + if (pos.Z < 0) pos.Z = 0; + } +/* if (pos.X < 0 || pos.X >= (int)Constants.RegionSize || pos.Y < 0 || pos.Y >= (int)Constants.RegionSize || pos.Z < 0) { Vector3 emergencyPos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128); @@ -781,7 +792,7 @@ pos = emergencyPos; } - +*/ float localAVHeight = 1.56f; if (m_avHeight != 127.0f) @@ -1461,6 +1472,11 @@ } } + // by Fumi.Iseki for Falling on Land or Object + if (!m_physicsActor.Flying && m_movementAnimation=="FALLDOWN" && (m_physicsActor.IsColliding || m_physicsActor.CollidingGround)) { + update_movementflag = true; + } + if (update_movementflag || (update_rotation && DCFlagKeyPressed)) { // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); @@ -2916,6 +2932,8 @@ /// protected void CrossToNewRegion() { + // Fumi.Iseki + if (m_scene==null || m_physicsActor==null) return; InTransit(); m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying); } diff -Nur opensim-/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs opensim/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs --- opensim-/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs 2009-09-02 15:20:09.000000000 +0900 +++ opensim/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs 2009-09-02 15:22:33.000000000 +0900 @@ -232,6 +232,8 @@ private float[] _watermap; private bool m_filterCollisions = true; + private float[] _origheightmap; // readded by Fumi.Iseki + private d.NearCallback nearCallback; public d.TriCallback triCallback; public d.TriArrayCallback triArrayCallback; @@ -1592,8 +1594,11 @@ index = (int)((int)y * (int)Constants.RegionSize + (int)x); - if (index < TerrainHeightFieldHeights[heightFieldGeom].Length) - return (float)TerrainHeightFieldHeights[heightFieldGeom][(int)y * (int)Constants.RegionSize + (int)x]; + // by Fumi.Iseki + //if (index < TerrainHeightFieldHeights[heightFieldGeom].Length) + // return (float)TerrainHeightFieldHeights[heightFieldGeom][(int)y * (int)Constants.RegionSize + (int)x]; + if (index < _origheightmap.Length) + return (float)_origheightmap[index]; else return 0f; } @@ -1614,7 +1619,6 @@ return 0f; } - } // End recovered. Kitto Flora @@ -2964,8 +2968,39 @@ { foreach (OdeCharacter actor in _characters) { - if (actor != null) + if (actor != null) { actor.UpdatePositionAndVelocity(); + + // by Fumi.Iseki for falling at SIM boundary + d.Vector3 vec = d.BodyGetPosition(actor.Body); + + if ((vec.Y<=0.0f || vec.Y>=255.95f || vec.X<=0.0f || vec.X>=255.95f) && !actor.IsColliding && !actor.CollidingGround) { + if (vec.Y<=0.0f) vec.Y = 0.1f; + else if (vec.Y>255.95f) vec.Y = 255.95f; + if (vec.X<=0.0f) vec.X = 0.1f; + else if (vec.X>255.95f) vec.X = 255.95f; + + float height = GetTerrainHeightAtXY(vec.X, vec.Y); + if (actor.Flying) { + if (vec.Z < height + 2) { + vec.Z = height + actor.Size.Z/2; + actor.Velocity.Z = 0; + actor.IsColliding = true; + } + } + else { + if (vec.Z < height + actor.Size.Z/2) { + vec.Z = height + actor.Size.Z/2; + actor.Velocity.Z = 0; + actor.IsColliding = true; + actor.CollidingGround = true; + } + } + + actor.Position = new PhysicsVector(vec.X, vec.Y, vec.Z); + d.BodySetPosition(actor.Body, vec.X, vec.Y, vec.Z); + } + } } } @@ -3312,6 +3347,8 @@ public override void SetTerrain(float[] heightMap) { + _origheightmap = heightMap; // readded by Fumi.Iseki + if (m_worldOffset != Vector3.Zero && m_parentScene != null) { if (m_parentScene is OdeScene) diff -Nur opensim-/bin/OpenMetaverse.dll.config opensim/bin/OpenMetaverse.dll.config --- opensim-/bin/OpenMetaverse.dll.config 2009-09-02 15:20:09.000000000 +0900 +++ opensim/bin/OpenMetaverse.dll.config 2009-09-02 15:22:33.000000000 +0900 @@ -1,7 +1,7 @@ - +