From c3d40feeb604bb19abd419eea381bd7f2df9bac1 Mon Sep 17 00:00:00 2001
From: gareth
Date: Sun, 4 Mar 2007 03:36:08 +0000
Subject: Implemented chat Fixed "sticky borders" bug (avatar can hit side of
 sim and move away)

---
 src/world/PhysicsEngine.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/world')

diff --git a/src/world/PhysicsEngine.cs b/src/world/PhysicsEngine.cs
index d9351af..4abf1f2 100644
--- a/src/world/PhysicsEngine.cs
+++ b/src/world/PhysicsEngine.cs
@@ -20,12 +20,12 @@ namespace OpenSim.world
 	public void DoStuff(World simworld) {
          foreach (libsecondlife.LLUUID UUID in simworld.Entities.Keys)
             {
-                        if((simworld.Entities[UUID].position.X>0) & (simworld.Entities[UUID].position.X<256) & (simworld.Entities[UUID].position.Y>1) & (simworld.Entities[UUID].position.Y<256)) {
 				simworld.Entities[UUID].position += simworld.Entities[UUID].velocity;
 				simworld.Entities[UUID].position.Z = simworld.LandMap[(int)simworld.Entities[UUID].position.Y * 256 + (int)simworld.Entities[UUID].position.X]+1;
-			} else {
-				simworld.Entities[UUID].velocity = new LLVector3(0f,0f,0f);
-			}
+				if(simworld.Entities[UUID].position.X<0) simworld.Entities[UUID].position.X=0;
+				if(simworld.Entities[UUID].position.Y<0) simworld.Entities[UUID].position.Y=0;
+				if(simworld.Entities[UUID].position.X>255) simworld.Entities[UUID].position.X=255;
+				if(simworld.Entities[UUID].position.Y>255) simworld.Entities[UUID].position.Y=255;
             }
 	}
     }
-- 
cgit v1.1