From 93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c Mon Sep 17 00:00:00 2001 From: MW Date: Mon, 9 Jul 2007 15:59:35 +0000 Subject: Done a little bit of renaming in primitive.cs and on a few events in IClientAPI. Disabled CAPS asset uploading as it seems it now crashes the server. --- OpenSim/Region/Environment/Scenes/EntityBase.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/EntityBase.cs') diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index 7914bab..6360ae1 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes } } - public LLVector3 velocity; + public LLVector3 m_velocity; /// /// @@ -47,25 +47,25 @@ namespace OpenSim.Region.Environment.Scenes { get { - return velocity; + return m_velocity; } set { - velocity = value; + m_velocity = value; } } - public Quaternion _rotation = new Quaternion(0,0,1,0); + protected Quaternion m_rotation = new Quaternion(0,0,1,0); public virtual Quaternion rotation { get { - return _rotation; + return m_rotation; } set { - _rotation = value; + m_rotation = value; } } @@ -85,7 +85,7 @@ namespace OpenSim.Region.Environment.Scenes uuid = new LLUUID(); m_pos = new LLVector3(); - velocity = new LLVector3(); + m_velocity = new LLVector3(); rotation = new Quaternion(); m_name = "(basic entity)"; children = new List(); -- cgit v1.1