diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index badd357..efdc19c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -59,6 +59,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
59 | REGION = 256, | 59 | REGION = 256, |
60 | TELEPORT = 512, | 60 | TELEPORT = 512, |
61 | REGION_RESTART = 1024, | 61 | REGION_RESTART = 1024, |
62 | MEDIA = 2048, | ||
62 | ANIMATION = 16384 | 63 | ANIMATION = 16384 |
63 | } | 64 | } |
64 | 65 | ||
@@ -330,6 +331,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
330 | protected Vector3 m_lastAcceleration; | 331 | protected Vector3 m_lastAcceleration; |
331 | protected Vector3 m_lastAngularVelocity; | 332 | protected Vector3 m_lastAngularVelocity; |
332 | protected int m_lastTerseSent; | 333 | protected int m_lastTerseSent; |
334 | |||
335 | /// <summary> | ||
336 | /// Stores media texture data | ||
337 | /// </summary> | ||
338 | protected string m_mediaUrl; | ||
333 | 339 | ||
334 | // TODO: Those have to be changed into persistent properties at some later point, | 340 | // TODO: Those have to be changed into persistent properties at some later point, |
335 | // or sit-camera on vehicles will break on sim-crossing. | 341 | // or sit-camera on vehicles will break on sim-crossing. |
@@ -984,18 +990,39 @@ namespace OpenSim.Region.Framework.Scenes | |||
984 | TriggerScriptChangedEvent(Changed.SCALE); | 990 | TriggerScriptChangedEvent(Changed.SCALE); |
985 | } | 991 | } |
986 | } | 992 | } |
993 | |||
987 | public byte UpdateFlag | 994 | public byte UpdateFlag |
988 | { | 995 | { |
989 | get { return m_updateFlag; } | 996 | get { return m_updateFlag; } |
990 | set { m_updateFlag = value; } | 997 | set { m_updateFlag = value; } |
991 | } | 998 | } |
999 | |||
1000 | /// <summary> | ||
1001 | /// Used for media on a prim. | ||
1002 | /// </summary> | ||
1003 | /// Do not change this value directly - always do it through an IMoapModule. | ||
1004 | public string MediaUrl | ||
1005 | { | ||
1006 | get | ||
1007 | { | ||
1008 | return m_mediaUrl; | ||
1009 | } | ||
1010 | |||
1011 | set | ||
1012 | { | ||
1013 | m_mediaUrl = value; | ||
1014 | |||
1015 | if (ParentGroup != null) | ||
1016 | ParentGroup.HasGroupChanged = true; | ||
1017 | } | ||
1018 | } | ||
992 | 1019 | ||
993 | [XmlIgnore] | 1020 | [XmlIgnore] |
994 | public bool CreateSelected | 1021 | public bool CreateSelected |
995 | { | 1022 | { |
996 | get { return m_createSelected; } | 1023 | get { return m_createSelected; } |
997 | set { m_createSelected = value; } | 1024 | set { m_createSelected = value; } |
998 | } | 1025 | } |
999 | 1026 | ||
1000 | #endregion | 1027 | #endregion |
1001 | 1028 | ||
@@ -1553,6 +1580,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1553 | /// <summary> | 1580 | /// <summary> |
1554 | /// Duplicates this part. | 1581 | /// Duplicates this part. |
1555 | /// </summary> | 1582 | /// </summary> |
1583 | /// <param name="localID"></param> | ||
1584 | /// <param name="AgentID"></param> | ||
1585 | /// <param name="GroupID"></param> | ||
1586 | /// <param name="linkNum"></param> | ||
1587 | /// <param name="userExposed">True if the duplicate will immediately be in the scene, false otherwise</param> | ||
1556 | /// <returns></returns> | 1588 | /// <returns></returns> |
1557 | public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed) | 1589 | public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed) |
1558 | { | 1590 | { |
@@ -1616,7 +1648,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1616 | dupe.DoPhysicsPropertyUpdate(UsePhysics, true); | 1648 | dupe.DoPhysicsPropertyUpdate(UsePhysics, true); |
1617 | } | 1649 | } |
1618 | 1650 | ||
1619 | return dupe; | 1651 | ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed); |
1652 | |||
1653 | // m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); | ||
1654 | |||
1655 | return dupe; | ||
1620 | } | 1656 | } |
1621 | 1657 | ||
1622 | protected void AssetReceived(string id, Object sender, AssetBase asset) | 1658 | protected void AssetReceived(string id, Object sender, AssetBase asset) |