From fd8ead61f6993f54e2f932f8bbdd183f78b72651 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 14 Jun 2007 10:16:28 +0000
Subject: Fixed the bug that makes a region use its water height as its name
 (in regionhandshake), which lead to most regions being called "20". (applied
 fix to sugilite) Rearranged some of the methods in ClientView.API.

---
 OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs | 38 +++++++++++-----------
 OpenSim/OpenSim.Region/Scene/Scene.cs              |  6 +++-
 2 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'OpenSim/OpenSim.Region')

diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
index aa747d3..f3972af 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
@@ -245,26 +245,26 @@ namespace OpenSim.Region
         /// 
         /// </summary>
         /// <param name="addPacket"></param>
-        public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
+        public void UpdateShape(ObjectShapePacket.ObjectDataBlock updatePacket)
         {
-            this.primData.PathBegin = addPacket.PathBegin;
-            this.primData.PathEnd = addPacket.PathEnd;
-            this.primData.PathScaleX = addPacket.PathScaleX;
-            this.primData.PathScaleY = addPacket.PathScaleY;
-            this.primData.PathShearX = addPacket.PathShearX;
-            this.primData.PathShearY = addPacket.PathShearY;
-            this.primData.PathSkew = addPacket.PathSkew;
-            this.primData.ProfileBegin = addPacket.ProfileBegin;
-            this.primData.ProfileEnd = addPacket.ProfileEnd;
-            this.primData.PathCurve = addPacket.PathCurve;
-            this.primData.ProfileCurve = addPacket.ProfileCurve;
-            this.primData.ProfileHollow = addPacket.ProfileHollow;
-            this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
-            this.primData.PathRevolutions = addPacket.PathRevolutions;
-            this.primData.PathTaperX = addPacket.PathTaperX;
-            this.primData.PathTaperY = addPacket.PathTaperY;
-            this.primData.PathTwist = addPacket.PathTwist;
-            this.primData.PathTwistBegin = addPacket.PathTwistBegin;
+            this.primData.PathBegin = updatePacket.PathBegin;
+            this.primData.PathEnd = updatePacket.PathEnd;
+            this.primData.PathScaleX = updatePacket.PathScaleX;
+            this.primData.PathScaleY = updatePacket.PathScaleY;
+            this.primData.PathShearX = updatePacket.PathShearX;
+            this.primData.PathShearY = updatePacket.PathShearY;
+            this.primData.PathSkew = updatePacket.PathSkew;
+            this.primData.ProfileBegin = updatePacket.ProfileBegin;
+            this.primData.ProfileEnd = updatePacket.ProfileEnd;
+            this.primData.PathCurve = updatePacket.PathCurve;
+            this.primData.ProfileCurve = updatePacket.ProfileCurve;
+            this.primData.ProfileHollow = updatePacket.ProfileHollow;
+            this.primData.PathRadiusOffset = updatePacket.PathRadiusOffset;
+            this.primData.PathRevolutions = updatePacket.PathRevolutions;
+            this.primData.PathTaperX = updatePacket.PathTaperX;
+            this.primData.PathTaperY = updatePacket.PathTaperY;
+            this.primData.PathTwist = updatePacket.PathTwist;
+            this.primData.PathTwistBegin = updatePacket.PathTwistBegin;
         }
 
         /// <summary>
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
index 6b27f8f..9f0ab93 100644
--- a/OpenSim/OpenSim.Region/Scene/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.cs
@@ -312,7 +312,6 @@ namespace OpenSim.Region
 
         #endregion
 
-
         #region Regenerate Terrain
 
         /// <summary>
@@ -638,6 +637,11 @@ namespace OpenSim.Region
             return result;
         }
 
+        /// <summary>
+        /// Request a Avatar by UUID
+        /// </summary>
+        /// <param name="avatarID"></param>
+        /// <returns></returns>
         public Avatar RequestAvatar(LLUUID avatarID)
         {
             if (this.Avatars.ContainsKey(avatarID))
-- 
cgit v1.1