OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed the properties so that most of them only take up one line per get/set.

afrisby
MW 2007-08-03 20:09:55 +00:00
parent e4196ee6b8
commit a6aea50eac
2 changed files with 38 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
View File

@ -27,10 +27,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public int PrimCount
{
get
{
return 1;
}
get { return 1; }
}
/// <summary>
@ -38,10 +35,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public LLVector3 GroupCentrePoint
{
get
{
return new LLVector3(0, 0, 0);
}
get { return new LLVector3(0, 0, 0); }
}
/// <summary>
@ -83,13 +77,13 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns>
public new AllNewSceneObjectGroup2 Copy()
{
AllNewSceneObjectGroup2 dupe = (AllNewSceneObjectGroup2) this.MemberwiseClone();
AllNewSceneObjectGroup2 dupe = (AllNewSceneObjectGroup2)this.MemberwiseClone();
dupe.Pos = new LLVector3(Pos.X, Pos.Y, Pos.Z);
dupe.m_scene = m_scene;
dupe.m_regionHandle = this.m_regionHandle;
dupe.CopyRootPart(this.m_rootPart);
foreach (AllNewSceneObjectPart2 part in this.m_parts.Values)
{
if (part.UUID != this.m_rootPart.UUID)
@ -517,7 +511,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns>
public List<ScenePresence> RequestSceneAvatars()
{
return m_scene.RequestAvatarList();
return m_scene.RequestAvatarList();
}
}
}

149
OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
View File

@ -38,31 +38,19 @@ namespace OpenSim.Region.Environment.Scenes
private byte m_updateFlag;
#region Properties
protected LLUUID m_uuid;
public LLUUID UUID
{
get
{
return m_uuid;
}
set
{
value = m_uuid;
}
get { return m_uuid; }
set { value = m_uuid; }
}
protected uint m_localID;
public uint LocalID
{
get
{
return m_localID;
}
set
{
m_localID = value;
}
get { return m_localID; }
set { m_localID = value; }
}
protected string m_name;
@ -75,124 +63,70 @@ namespace OpenSim.Region.Environment.Scenes
set { m_name = value; }
}
protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags) 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
public uint ObjectFlags
{
get
{
return (uint)m_flags;
}
set
{
m_flags =(LLObject.ObjectFlags) value;
}
get { return (uint)m_flags; }
set { m_flags = (LLObject.ObjectFlags)value; }
}
protected LLObject.MaterialType m_material;
public byte Material
{
get
{
return (byte)m_material;
}
set
{
m_material = (LLObject.MaterialType) value;
}
get { return (byte)m_material; }
set { m_material = (LLObject.MaterialType)value; }
}
protected ulong m_regionHandle;
public ulong RegionHandle
{
get
{
return m_regionHandle;
}
set
{
m_regionHandle = value;
}
get { return m_regionHandle; }
set { m_regionHandle = value; }
}
protected LLVector3 m_offset;
public LLVector3 OffsetPosition
{
get
{
return m_offset;
}
set
{
m_offset = value;
}
get { return m_offset; }
set { m_offset = value; }
}
protected LLQuaternion m_rotationOffset;
public LLQuaternion RotationOffset
{
get
{
return m_rotationOffset;
}
set
{
m_rotationOffset = value;
}
get { return m_rotationOffset; }
set { m_rotationOffset = value; }
}
protected LLVector3 m_velocity;
/// <summary></summary>
public LLVector3 Velocity
{
get
{
return m_velocity;
}
set
{
m_velocity = value;
}
get { return m_velocity; }
set { m_velocity = value; }
}
protected LLVector3 m_angularVelocity;
/// <summary></summary>
public LLVector3 AngularVelocity
{
get
{
return m_angularVelocity;
}
set
{
m_angularVelocity = value;
}
get { return m_angularVelocity; }
set { m_angularVelocity = value; }
}
protected LLVector3 m_acceleration;
/// <summary></summary>
public LLVector3 Acceleration
{
get
{
return m_acceleration;
}
set
{
m_acceleration = value;
}
get { return m_acceleration; }
set { m_acceleration = value; }
}
private string m_description = "";
public string Description
{
get
{
return this.m_description;
}
set
{
this.m_description = value;
}
get { return this.m_description; }
set { this.m_description = value; }
}
private string m_text = "";
@ -210,44 +144,27 @@ namespace OpenSim.Region.Environment.Scenes
public string SitName
{
get { return m_sitName; }
set
{
m_sitName = value;
}
set { m_sitName = value; }
}
private string m_touchName = "";
public string TouchName
{
get { return m_touchName; }
set
{
m_touchName = value;
}
set { m_touchName = value; }
}
public PrimitiveBaseShape Shape
{
get
{
return this.m_shape;
}
set
{
m_shape = value;
}
get { return this.m_shape; }
set { m_shape = value; }
}
public LLVector3 Scale
{
set
{
this.m_shape.Scale = value;
}
get
{
return this.m_shape.Scale;
}
set { this.m_shape.Scale = value; }
get { return this.m_shape.Scale; }
}
#endregion
@ -289,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes
this.Acceleration = new LLVector3(0, 0, 0);
//temporary code just so the m_flags field doesn't give a compiler warning
if (m_flags ==LLObject.ObjectFlags.AllowInventoryDrop)
if (m_flags == LLObject.ObjectFlags.AllowInventoryDrop)
{
}
@ -330,7 +247,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns>
public AllNewSceneObjectPart2 Copy(Scene scene)
{
AllNewSceneObjectPart2 dupe =(AllNewSceneObjectPart2) this.MemberwiseClone();
AllNewSceneObjectPart2 dupe = (AllNewSceneObjectPart2)this.MemberwiseClone();
dupe.m_shape = m_shape.Copy();
dupe.m_regionHandle = m_regionHandle;
uint newLocalID = scene.PrimIDAllocate();