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> /// </summary>
public int PrimCount public int PrimCount
{ {
get get { return 1; }
{
return 1;
}
} }
/// <summary> /// <summary>
@ -38,10 +35,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public LLVector3 GroupCentrePoint public LLVector3 GroupCentrePoint
{ {
get get { return new LLVector3(0, 0, 0); }
{
return new LLVector3(0, 0, 0);
}
} }
/// <summary> /// <summary>
@ -83,13 +77,13 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns> /// <returns></returns>
public new AllNewSceneObjectGroup2 Copy() 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.Pos = new LLVector3(Pos.X, Pos.Y, Pos.Z);
dupe.m_scene = m_scene; dupe.m_scene = m_scene;
dupe.m_regionHandle = this.m_regionHandle; dupe.m_regionHandle = this.m_regionHandle;
dupe.CopyRootPart(this.m_rootPart); dupe.CopyRootPart(this.m_rootPart);
foreach (AllNewSceneObjectPart2 part in this.m_parts.Values) foreach (AllNewSceneObjectPart2 part in this.m_parts.Values)
{ {
if (part.UUID != this.m_rootPart.UUID) if (part.UUID != this.m_rootPart.UUID)
@ -517,7 +511,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns> /// <returns></returns>
public List<ScenePresence> RequestSceneAvatars() 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; private byte m_updateFlag;
#region Properties #region Properties
protected LLUUID m_uuid; protected LLUUID m_uuid;
public LLUUID UUID public LLUUID UUID
{ {
get get { return m_uuid; }
{ set { value = m_uuid; }
return m_uuid;
}
set
{
value = m_uuid;
}
} }
protected uint m_localID; protected uint m_localID;
public uint LocalID public uint LocalID
{ {
get get { return m_localID; }
{ set { m_localID = value; }
return m_localID;
}
set
{
m_localID = value;
}
} }
protected string m_name; protected string m_name;
@ -75,124 +63,70 @@ namespace OpenSim.Region.Environment.Scenes
set { m_name = value; } 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 public uint ObjectFlags
{ {
get get { return (uint)m_flags; }
{ set { m_flags = (LLObject.ObjectFlags)value; }
return (uint)m_flags;
}
set
{
m_flags =(LLObject.ObjectFlags) value;
}
} }
protected LLObject.MaterialType m_material; protected LLObject.MaterialType m_material;
public byte Material public byte Material
{ {
get get { return (byte)m_material; }
{ set { m_material = (LLObject.MaterialType)value; }
return (byte)m_material;
}
set
{
m_material = (LLObject.MaterialType) value;
}
} }
protected ulong m_regionHandle; protected ulong m_regionHandle;
public ulong RegionHandle public ulong RegionHandle
{ {
get get { return m_regionHandle; }
{ set { m_regionHandle = value; }
return m_regionHandle;
}
set
{
m_regionHandle = value;
}
} }
protected LLVector3 m_offset; protected LLVector3 m_offset;
public LLVector3 OffsetPosition public LLVector3 OffsetPosition
{ {
get get { return m_offset; }
{ set { m_offset = value; }
return m_offset;
}
set
{
m_offset = value;
}
} }
protected LLQuaternion m_rotationOffset; protected LLQuaternion m_rotationOffset;
public LLQuaternion RotationOffset public LLQuaternion RotationOffset
{ {
get get { return m_rotationOffset; }
{ set { m_rotationOffset = value; }
return m_rotationOffset;
}
set
{
m_rotationOffset = value;
}
} }
protected LLVector3 m_velocity; protected LLVector3 m_velocity;
/// <summary></summary> /// <summary></summary>
public LLVector3 Velocity public LLVector3 Velocity
{ {
get get { return m_velocity; }
{ set { m_velocity = value; }
return m_velocity;
}
set
{
m_velocity = value;
}
} }
protected LLVector3 m_angularVelocity; protected LLVector3 m_angularVelocity;
/// <summary></summary> /// <summary></summary>
public LLVector3 AngularVelocity public LLVector3 AngularVelocity
{ {
get get { return m_angularVelocity; }
{ set { m_angularVelocity = value; }
return m_angularVelocity;
}
set
{
m_angularVelocity = value;
}
} }
protected LLVector3 m_acceleration; protected LLVector3 m_acceleration;
/// <summary></summary> /// <summary></summary>
public LLVector3 Acceleration public LLVector3 Acceleration
{ {
get get { return m_acceleration; }
{ set { m_acceleration = value; }
return m_acceleration;
}
set
{
m_acceleration = value;
}
} }
private string m_description = ""; private string m_description = "";
public string Description public string Description
{ {
get get { return this.m_description; }
{ set { this.m_description = value; }
return this.m_description;
}
set
{
this.m_description = value;
}
} }
private string m_text = ""; private string m_text = "";
@ -210,44 +144,27 @@ namespace OpenSim.Region.Environment.Scenes
public string SitName public string SitName
{ {
get { return m_sitName; } get { return m_sitName; }
set set { m_sitName = value; }
{
m_sitName = value;
}
} }
private string m_touchName = ""; private string m_touchName = "";
public string TouchName public string TouchName
{ {
get { return m_touchName; } get { return m_touchName; }
set set { m_touchName = value; }
{
m_touchName = value;
}
} }
public PrimitiveBaseShape Shape public PrimitiveBaseShape Shape
{ {
get
{ get { return this.m_shape; }
return this.m_shape; set { m_shape = value; }
}
set
{
m_shape = value;
}
} }
public LLVector3 Scale public LLVector3 Scale
{ {
set set { this.m_shape.Scale = value; }
{ get { return this.m_shape.Scale; }
this.m_shape.Scale = value;
}
get
{
return this.m_shape.Scale;
}
} }
#endregion #endregion
@ -289,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes
this.Acceleration = new LLVector3(0, 0, 0); this.Acceleration = new LLVector3(0, 0, 0);
//temporary code just so the m_flags field doesn't give a compiler warning //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> /// <returns></returns>
public AllNewSceneObjectPart2 Copy(Scene scene) public AllNewSceneObjectPart2 Copy(Scene scene)
{ {
AllNewSceneObjectPart2 dupe =(AllNewSceneObjectPart2) this.MemberwiseClone(); AllNewSceneObjectPart2 dupe = (AllNewSceneObjectPart2)this.MemberwiseClone();
dupe.m_shape = m_shape.Copy(); dupe.m_shape = m_shape.Copy();
dupe.m_regionHandle = m_regionHandle; dupe.m_regionHandle = m_regionHandle;
uint newLocalID = scene.PrimIDAllocate(); uint newLocalID = scene.PrimIDAllocate();