diff options
author | Melanie | 2009-08-15 19:00:56 +0100 |
---|---|---|
committer | Melanie | 2009-08-15 19:00:56 +0100 |
commit | 973be659459c577433b831c451ff07048aa078be (patch) | |
tree | 887f0586edbb936cca2fb8381699d921a2299492 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
parent | Changed FromAssetID to FromItemID (diff) | |
download | opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.zip opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.gz opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.bz2 opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.xz |
Merge branch 'master' of ../opensim-diva/ into inventory-connector
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3646811..c95667a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
139 | public uint TimeStampTerse = 0; | 139 | public uint TimeStampTerse = 0; |
140 | 140 | ||
141 | [XmlIgnore] | 141 | [XmlIgnore] |
142 | public UUID FromAssetID = UUID.Zero; | 142 | public UUID FromItemID = UUID.Zero; |
143 | 143 | ||
144 | /// <value> | 144 | /// <value> |
145 | /// The UUID of the user inventory item from which this object was rezzed if this is a root part. | 145 | /// The UUID of the user inventory item from which this object was rezzed if this is a root part. |
@@ -2389,7 +2389,7 @@ if (m_shape != null) { | |||
2389 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, | 2389 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, |
2390 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, | 2390 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, |
2391 | m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, | 2391 | m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, |
2392 | AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); | 2392 | AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius); |
2393 | } | 2393 | } |
2394 | 2394 | ||
2395 | /// <summary> | 2395 | /// <summary> |
@@ -3767,7 +3767,7 @@ if (m_shape != null) { | |||
3767 | (ushort)(m_parentGroup.GetTimeDilation() * | 3767 | (ushort)(m_parentGroup.GetTimeDilation() * |
3768 | (float)ushort.MaxValue), LocalId, lPos, | 3768 | (float)ushort.MaxValue), LocalId, lPos, |
3769 | RotationOffset, Velocity, | 3769 | RotationOffset, Velocity, |
3770 | RotationalVelocity, state, FromAssetID, | 3770 | RotationalVelocity, state, FromItemID, |
3771 | OwnerID, (int)AttachmentPoint); | 3771 | OwnerID, (int)AttachmentPoint); |
3772 | } | 3772 | } |
3773 | 3773 | ||