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

* Changed a number of field names to ccc (public members shouldn't be called m_)

0.6.0-stable
lbsa71 2008-07-26 21:22:15 +00:00
parent c12d4d21e3
commit 8e869b2fff
8 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -1125,13 +1125,13 @@ namespace OpenSim.Region.Environment.Scenes
if (group != null)
{
// LLVector3 oldPos = group.AbsolutePosition;
if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment)
if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment)
{
group.SendGroupTerseUpdate();
return;
}
if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment)
if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment)
{
group.UpdateSinglePosition(pos, localID);
}
@ -1151,19 +1151,19 @@ namespace OpenSim.Region.Environment.Scenes
{
// LLVector3 oldPos = group.AbsolutePosition;
if (group.RootPart.m_IsAttachment)
if (group.RootPart.IsAttachment)
{
group.UpdateGroupPosition(pos);
}
else
{
if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment)
if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment)
{
group.SendGroupTerseUpdate();
return;
}
if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment)
if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment)
{
group.UpdateGroupPosition(pos);
}

50
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -196,7 +196,7 @@ namespace OpenSim.Region.Environment.Scenes
set
{
LLVector3 val = value;
if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !m_rootPart.m_IsAttachment)
if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !m_rootPart.IsAttachment)
{
m_scene.CrossPrimGroupIntoNewRegion(val, this);
}
@ -491,7 +491,7 @@ namespace OpenSim.Region.Environment.Scenes
{
foreach (SceneObjectPart part in m_parts.Values)
{
part.fromAssetID = AssetId;
part.FromAssetID = AssetId;
}
}
}
@ -500,7 +500,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (m_rootPart != null)
{
return m_rootPart.fromAssetID;
return m_rootPart.FromAssetID;
}
return LLUUID.Zero;
}
@ -690,7 +690,7 @@ namespace OpenSim.Region.Environment.Scenes
if (avatar != null)
{
DetachFromBackup(this);
m_rootPart.m_attachedAvatar = agentID;
m_rootPart.AttachedAvatar = agentID;
if (m_rootPart.PhysActor != null)
@ -701,8 +701,8 @@ namespace OpenSim.Region.Environment.Scenes
}
AbsolutePosition = AttachOffset;
m_rootPart.m_attachedPos = AttachOffset;
m_rootPart.m_IsAttachment = true;
m_rootPart.AttachedPos = AttachOffset;
m_rootPart.IsAttachment = true;
m_rootPart.SetParentLocalId(avatar.LocalId);
lock (m_parts)
@ -736,7 +736,7 @@ namespace OpenSim.Region.Environment.Scenes
public void DetachToGround()
{
ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar);
ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.AttachedAvatar);
LLVector3 detachedpos = new LLVector3(127f,127f,127f);
if (avatar != null)
{
@ -744,10 +744,10 @@ namespace OpenSim.Region.Environment.Scenes
avatar.RemoveAttachment(this);
}
AbsolutePosition = detachedpos;
m_rootPart.m_attachedAvatar = LLUUID.Zero;
m_rootPart.AttachedAvatar = LLUUID.Zero;
m_rootPart.SetParentLocalId(0);
m_rootPart.SetAttachmentPoint((byte)0);
m_rootPart.m_IsAttachment = false;
m_rootPart.IsAttachment = false;
m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
HasGroupChanged = true;
AttachToBackup();
@ -757,7 +757,7 @@ namespace OpenSim.Region.Environment.Scenes
public void DetachToInventoryPrep()
{
ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar);
ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.AttachedAvatar);
//LLVector3 detachedpos = new LLVector3(127f, 127f, 127f);
if (avatar != null)
{
@ -765,11 +765,11 @@ namespace OpenSim.Region.Environment.Scenes
avatar.RemoveAttachment(this);
}
m_rootPart.m_attachedAvatar = LLUUID.Zero;
m_rootPart.AttachedAvatar = LLUUID.Zero;
m_rootPart.SetParentLocalId(0);
//m_rootPart.SetAttachmentPoint((byte)0);
m_rootPart.m_IsAttachment = false;
AbsolutePosition = m_rootPart.m_attachedPos;
m_rootPart.IsAttachment = false;
AbsolutePosition = m_rootPart.AttachedPos;
//m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
//AttachToBackup();
//m_rootPart.ScheduleFullUpdate();
@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Environment.Scenes
continue;
if (part != RootPart)
part.ObjectFlags = objectflagupdate;
aggregateScriptEvents |= part.m_aggregateScriptEvents;
aggregateScriptEvents |= part.AggregateScriptEvents;
}
}
@ -1154,9 +1154,9 @@ namespace OpenSim.Region.Environment.Scenes
{
if (m_rootPart.UUID == part.UUID)
{
if (m_rootPart.m_IsAttachment)
if (m_rootPart.IsAttachment)
{
part.SendFullUpdateToClient(remoteClient, m_rootPart.m_attachedPos, clientFlags);
part.SendFullUpdateToClient(remoteClient, m_rootPart.AttachedPos, clientFlags);
}
else
{
@ -1178,9 +1178,9 @@ namespace OpenSim.Region.Environment.Scenes
{
if (m_rootPart.UUID == part.UUID)
{
if (m_rootPart.m_IsAttachment)
if (m_rootPart.IsAttachment)
{
part.SendTerseUpdateToClient(remoteClient, m_rootPart.m_attachedPos);
part.SendTerseUpdateToClient(remoteClient, m_rootPart.AttachedPos);
}
else
{
@ -1349,9 +1349,9 @@ namespace OpenSim.Region.Environment.Scenes
{
if (rootpart.PhysActor != null)
{
if (rootpart.m_IsAttachment)
if (rootpart.IsAttachment)
{
ScenePresence avatar = m_scene.GetScenePresence(rootpart.m_attachedAvatar);
ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
if (avatar != null)
{
avatar.PushForce(impulse);
@ -2326,9 +2326,9 @@ namespace OpenSim.Region.Environment.Scenes
{
if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
{
if (m_rootPart.m_IsAttachment)
if (m_rootPart.IsAttachment)
{
m_rootPart.m_attachedPos = pos;
m_rootPart.AttachedPos = pos;
}
AbsolutePosition = pos;
@ -2538,11 +2538,11 @@ namespace OpenSim.Region.Environment.Scenes
float setval = (rotate10 > 0) ? 1f : 0f;
if (setX)
m_rootPart.m_rotationAxis.X = setval;
m_rootPart.RotationAxis.X = setval;
if (setY)
m_rootPart.m_rotationAxis.Y = setval;
m_rootPart.RotationAxis.Y = setval;
if (setZ)
m_rootPart.m_rotationAxis.Z = setval;
m_rootPart.RotationAxis.Z = setval;
if (setX || setY || setZ)
{

66
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -128,22 +128,22 @@ namespace OpenSim.Region.Environment.Scenes
[XmlIgnore]
public uint TimeStampTerse = 0;
[XmlIgnore]
public LLUUID fromAssetID = LLUUID.Zero;
public LLUUID FromAssetID = LLUUID.Zero;
[XmlIgnore]
public bool m_IsAttachment = false;
public bool IsAttachment = false;
[XmlIgnore]
public scriptEvents m_aggregateScriptEvents = 0;
public scriptEvents AggregateScriptEvents = 0;
[XmlIgnore]
public LLUUID m_attachedAvatar = LLUUID.Zero;
public LLUUID AttachedAvatar = LLUUID.Zero;
[XmlIgnore]
public LLVector3 m_attachedPos = LLVector3.Zero;
public LLVector3 AttachedPos = LLVector3.Zero;
[XmlIgnore]
public uint m_attachmentPoint = (byte)0;
public uint AttachmentPoint = (byte)0;
[XmlIgnore]
public PhysicsVector m_rotationAxis = new PhysicsVector(1f,1f,1f);
public PhysicsVector RotationAxis = new PhysicsVector(1f,1f,1f);
[XmlIgnore]
public bool m_undoing = false;
public bool Undoing = false;
[XmlIgnore]
private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None;
@ -151,19 +151,19 @@ namespace OpenSim.Region.Environment.Scenes
private byte m_clickAction = 0;
private Color m_color = Color.Black;
private string m_description = String.Empty;
private List<uint> m_lastColliders = new List<uint>();
private readonly List<uint> m_lastColliders = new List<uint>();
// private PhysicsVector m_lastRotationalVelocity = PhysicsVector.Zero;
private int m_linkNum = 0;
[XmlIgnore]
private int m_scriptAccessPin = 0;
[XmlIgnore]
private Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
private readonly Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
private string m_sitName = String.Empty;
private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1);
private Vector3 m_sitTargetPosition = new Vector3(0, 0, 0);
private string m_text = String.Empty;
private string m_touchName = String.Empty;
private UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
private LLUUID _creatorID;
/// <summary>
@ -433,9 +433,9 @@ namespace OpenSim.Region.Environment.Scenes
m_groupPosition.Y = PhysActor.Position.Y;
m_groupPosition.Z = PhysActor.Position.Z;
}
if (m_IsAttachment)
if (IsAttachment)
{
ScenePresence sp = m_parentGroup.Scene.GetScenePresence(m_attachedAvatar);
ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
if (sp != null)
{
return sp.AbsolutePosition;
@ -744,7 +744,7 @@ namespace OpenSim.Region.Environment.Scenes
public LLVector3 AbsolutePosition
{
get {
if (m_IsAttachment)
if (IsAttachment)
return GroupPosition;
return m_offsetPosition + m_groupPosition; }
@ -769,7 +769,7 @@ namespace OpenSim.Region.Environment.Scenes
public scriptEvents ScriptEvents
{
get { return m_aggregateScriptEvents; }
get { return AggregateScriptEvents; }
}
@ -1907,7 +1907,7 @@ namespace OpenSim.Region.Environment.Scenes
oldparts = (scriptEvents) m_scriptEvents[scriptid];
// remove values from aggregated script events
m_aggregateScriptEvents &= ~oldparts;
AggregateScriptEvents &= ~oldparts;
m_scriptEvents.Remove(scriptid);
}
}
@ -2098,8 +2098,8 @@ namespace OpenSim.Region.Environment.Scenes
byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID,
m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment,
m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, IsAttachment,
AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
}
/// <summary>
@ -2213,7 +2213,7 @@ namespace OpenSim.Region.Environment.Scenes
// TODO: I have no idea why we are making this check. This should be sorted out
if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
{
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, fromAssetID);
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, FromAssetID);
}
else
{
@ -2226,15 +2226,15 @@ namespace OpenSim.Region.Environment.Scenes
public void SendTerseUpdateToClient(IClientAPI remoteClient, LLVector3 lPos)
{
LLQuaternion mRot = RotationOffset;
if (m_IsAttachment)
if (IsAttachment)
{
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, (byte)((m_attachmentPoint % 16) * 16 + (m_attachmentPoint / 16)),fromAssetID);
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, (byte)((AttachmentPoint % 16) * 16 + (AttachmentPoint / 16)),FromAssetID);
}
else
{
if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0)
{
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, fromAssetID);
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, FromAssetID);
}
else
{
@ -2247,7 +2247,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SetAttachmentPoint(uint AttachmentPoint)
{
m_attachmentPoint = AttachmentPoint;
this.AttachmentPoint = AttachmentPoint;
// save the attachment point.
//if (AttachmentPoint != 0)
@ -2335,7 +2335,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SetPhysicsAxisRotation()
{
PhysActor.LockAngularMotion(m_rotationAxis);
PhysActor.LockAngularMotion(RotationAxis);
m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
}
@ -2414,7 +2414,7 @@ namespace OpenSim.Region.Environment.Scenes
public void StoreUndoState()
{
if (!m_undoing)
if (!Undoing)
{
if (m_parentGroup != null)
{
@ -3232,22 +3232,22 @@ namespace OpenSim.Region.Environment.Scenes
{
foreach (scriptEvents s in m_scriptEvents.Values)
{
m_aggregateScriptEvents |= s;
AggregateScriptEvents |= s;
}
}
uint objectflagupdate = 0;
if (
((m_aggregateScriptEvents & scriptEvents.touch) != 0) ||
((m_aggregateScriptEvents & scriptEvents.touch_end) != 0) ||
((m_aggregateScriptEvents & scriptEvents.touch_start) != 0)
((AggregateScriptEvents & scriptEvents.touch) != 0) ||
((AggregateScriptEvents & scriptEvents.touch_end) != 0) ||
((AggregateScriptEvents & scriptEvents.touch_start) != 0)
)
{
objectflagupdate |= (uint) LLObject.ObjectFlags.Touch;
}
if ((m_aggregateScriptEvents & scriptEvents.money) != 0)
if ((AggregateScriptEvents & scriptEvents.money) != 0)
{
objectflagupdate |= (uint) LLObject.ObjectFlags.Money;
}
@ -3258,9 +3258,9 @@ namespace OpenSim.Region.Environment.Scenes
}
if (
((m_aggregateScriptEvents & scriptEvents.collision) != 0) ||
((m_aggregateScriptEvents & scriptEvents.collision_end) != 0) ||
((m_aggregateScriptEvents & scriptEvents.collision_start) != 0)
((AggregateScriptEvents & scriptEvents.collision) != 0) ||
((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
((AggregateScriptEvents & scriptEvents.collision_start) != 0)
)
{
// subscribe to physics updates.

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -2293,8 +2293,8 @@ namespace OpenSim.Region.Environment.Scenes
{
// Set the parent localID to 0 so it transfers over properly.
gobj.RootPart.SetParentLocalId(0);
gobj.RootPart.m_IsAttachment = false;
gobj.AbsolutePosition = gobj.RootPart.m_attachedPos;
gobj.RootPart.IsAttachment = false;
gobj.AbsolutePosition = gobj.RootPart.AttachedPos;
gobj.RootPart.LastOwnerID = gobj.GetFromAssetID();
m_scene.CrossPrimGroupIntoNewRegion(regionHandle, gobj);
}

4
OpenSim/Region/Environment/Scenes/UndoState.cs
View File

@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (part != null)
{
part.m_undoing = true;
part.Undoing = true;
if (part.ParentID == 0)
{
@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes
part.Resize(Scale);
part.ScheduleTerseUpdate();
}
part.m_undoing = false;
part.Undoing = false;
}
}

2
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -2554,7 +2554,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.AddScriptLPS(1);
if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar)
if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar)
{
// When attached, certain permissions are implicit if requested from owner
int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS |

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2432,7 +2432,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1);
if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar)
if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar)
{
// When attached, certain permissions are implicit if requested from owner
int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -468,7 +468,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
LLUUID appDomain=assetID;
if (part.ParentGroup.RootPart.m_IsAttachment)
if (part.ParentGroup.RootPart.IsAttachment)
appDomain = part.ParentGroup.RootPart.UUID;
if (!m_AppDomains.ContainsKey(appDomain))