aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer
diff options
context:
space:
mode:
authorAdam Frisby2007-06-05 11:59:38 +0000
committerAdam Frisby2007-06-05 11:59:38 +0000
commit7347f146c6f402351917a04e76abc353c03503b6 (patch)
tree8b69c4191abed206370091d6bb09b70f11a1f45c /OpenSim/OpenSim.RegionServer
parent*Cleaned up Configuration Setup questions (diff)
downloadopensim-SC_OLD-7347f146c6f402351917a04e76abc353c03503b6.zip
opensim-SC_OLD-7347f146c6f402351917a04e76abc353c03503b6.tar.gz
opensim-SC_OLD-7347f146c6f402351917a04e76abc353c03503b6.tar.bz2
opensim-SC_OLD-7347f146c6f402351917a04e76abc353c03503b6.tar.xz
* Small bugfix: Avatar rezzing from grid mode should no longer place you underground if you have terrain of reasonable height.
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs6
-rw-r--r--OpenSim/OpenSim.RegionServer/world/Primitive.cs1
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index 51e5fd6..586c9df 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -118,6 +118,12 @@ namespace OpenSim
118 { 118 {
119 this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code); 119 this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);
120 this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); 120 this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
121
122 // Dont rez new users underground
123 float aboveGround = 3.0f; // rez at least 3 meters above ground
124 if (this.startpos.Z < (m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround))
125 this.startpos.Z = m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround;
126
121 //Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z); 127 //Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
122 } 128 }
123 else 129 else
diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.RegionServer/world/Primitive.cs
index e048a9e..ed24504 100644
--- a/OpenSim/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim/OpenSim.RegionServer/world/Primitive.cs
@@ -378,6 +378,7 @@ namespace OpenSim.world
378 PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY; 378 PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY;
379 PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist; 379 PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;
380 PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin; 380 PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
381
381 objupdate.ObjectData[0].ID = (uint)(localID); 382 objupdate.ObjectData[0].ID = (uint)(localID);
382 objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000")); 383 objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000"));
383 objupdate.ObjectData[0].ObjectData = new byte[60]; 384 objupdate.ObjectData[0].ObjectData = new byte[60];