aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region/Scene
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.Region/Scene')
-rw-r--r--OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs38
-rw-r--r--OpenSim/OpenSim.Region/Scene/Scene.cs6
2 files changed, 24 insertions, 20 deletions
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
245 /// 245 ///
246 /// </summary> 246 /// </summary>
247 /// <param name="addPacket"></param> 247 /// <param name="addPacket"></param>
248 public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket) 248 public void UpdateShape(ObjectShapePacket.ObjectDataBlock updatePacket)
249 { 249 {
250 this.primData.PathBegin = addPacket.PathBegin; 250 this.primData.PathBegin = updatePacket.PathBegin;
251 this.primData.PathEnd = addPacket.PathEnd; 251 this.primData.PathEnd = updatePacket.PathEnd;
252 this.primData.PathScaleX = addPacket.PathScaleX; 252 this.primData.PathScaleX = updatePacket.PathScaleX;
253 this.primData.PathScaleY = addPacket.PathScaleY; 253 this.primData.PathScaleY = updatePacket.PathScaleY;
254 this.primData.PathShearX = addPacket.PathShearX; 254 this.primData.PathShearX = updatePacket.PathShearX;
255 this.primData.PathShearY = addPacket.PathShearY; 255 this.primData.PathShearY = updatePacket.PathShearY;
256 this.primData.PathSkew = addPacket.PathSkew; 256 this.primData.PathSkew = updatePacket.PathSkew;
257 this.primData.ProfileBegin = addPacket.ProfileBegin; 257 this.primData.ProfileBegin = updatePacket.ProfileBegin;
258 this.primData.ProfileEnd = addPacket.ProfileEnd; 258 this.primData.ProfileEnd = updatePacket.ProfileEnd;
259 this.primData.PathCurve = addPacket.PathCurve; 259 this.primData.PathCurve = updatePacket.PathCurve;
260 this.primData.ProfileCurve = addPacket.ProfileCurve; 260 this.primData.ProfileCurve = updatePacket.ProfileCurve;
261 this.primData.ProfileHollow = addPacket.ProfileHollow; 261 this.primData.ProfileHollow = updatePacket.ProfileHollow;
262 this.primData.PathRadiusOffset = addPacket.PathRadiusOffset; 262 this.primData.PathRadiusOffset = updatePacket.PathRadiusOffset;
263 this.primData.PathRevolutions = addPacket.PathRevolutions; 263 this.primData.PathRevolutions = updatePacket.PathRevolutions;
264 this.primData.PathTaperX = addPacket.PathTaperX; 264 this.primData.PathTaperX = updatePacket.PathTaperX;
265 this.primData.PathTaperY = addPacket.PathTaperY; 265 this.primData.PathTaperY = updatePacket.PathTaperY;
266 this.primData.PathTwist = addPacket.PathTwist; 266 this.primData.PathTwist = updatePacket.PathTwist;
267 this.primData.PathTwistBegin = addPacket.PathTwistBegin; 267 this.primData.PathTwistBegin = updatePacket.PathTwistBegin;
268 } 268 }
269 269
270 /// <summary> 270 /// <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
312 312
313 #endregion 313 #endregion
314 314
315
316 #region Regenerate Terrain 315 #region Regenerate Terrain
317 316
318 /// <summary> 317 /// <summary>
@@ -638,6 +637,11 @@ namespace OpenSim.Region
638 return result; 637 return result;
639 } 638 }
640 639
640 /// <summary>
641 /// Request a Avatar by UUID
642 /// </summary>
643 /// <param name="avatarID"></param>
644 /// <returns></returns>
641 public Avatar RequestAvatar(LLUUID avatarID) 645 public Avatar RequestAvatar(LLUUID avatarID)
642 { 646 {
643 if (this.Avatars.ContainsKey(avatarID)) 647 if (this.Avatars.ContainsKey(avatarID))