diff options
author | Melanie | 2010-08-06 17:47:55 +0100 |
---|---|---|
committer | Melanie | 2010-08-06 17:47:55 +0100 |
commit | 1cd441d5de0e19aac230e3bc8eac211662f209b5 (patch) | |
tree | 6b6a69e755fd72d894f8b3742efde6189883570e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Fixes: llSetLinkPrimitiveParams - PRIM_POSITION is not relative to root, caus... (diff) | |
parent | Merge branch 'moap' (diff) | |
download | opensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.zip opensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.tar.gz opensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.tar.bz2 opensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-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 69f9627..3dac0ad 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 | ||
@@ -321,6 +322,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
321 | protected Vector3 m_lastAcceleration; | 322 | protected Vector3 m_lastAcceleration; |
322 | protected Vector3 m_lastAngularVelocity; | 323 | protected Vector3 m_lastAngularVelocity; |
323 | protected int m_lastTerseSent; | 324 | protected int m_lastTerseSent; |
325 | |||
326 | /// <summary> | ||
327 | /// Stores media texture data | ||
328 | /// </summary> | ||
329 | protected string m_mediaUrl; | ||
324 | 330 | ||
325 | // TODO: Those have to be changed into persistent properties at some later point, | 331 | // TODO: Those have to be changed into persistent properties at some later point, |
326 | // or sit-camera on vehicles will break on sim-crossing. | 332 | // or sit-camera on vehicles will break on sim-crossing. |
@@ -965,18 +971,39 @@ namespace OpenSim.Region.Framework.Scenes | |||
965 | TriggerScriptChangedEvent(Changed.SCALE); | 971 | TriggerScriptChangedEvent(Changed.SCALE); |
966 | } | 972 | } |
967 | } | 973 | } |
974 | |||
968 | public byte UpdateFlag | 975 | public byte UpdateFlag |
969 | { | 976 | { |
970 | get { return m_updateFlag; } | 977 | get { return m_updateFlag; } |
971 | set { m_updateFlag = value; } | 978 | set { m_updateFlag = value; } |
972 | } | 979 | } |
980 | |||
981 | /// <summary> | ||
982 | /// Used for media on a prim. | ||
983 | /// </summary> | ||
984 | /// Do not change this value directly - always do it through an IMoapModule. | ||
985 | public string MediaUrl | ||
986 | { | ||
987 | get | ||
988 | { | ||
989 | return m_mediaUrl; | ||
990 | } | ||
991 | |||
992 | set | ||
993 | { | ||
994 | m_mediaUrl = value; | ||
995 | |||
996 | if (ParentGroup != null) | ||
997 | ParentGroup.HasGroupChanged = true; | ||
998 | } | ||
999 | } | ||
973 | 1000 | ||
974 | [XmlIgnore] | 1001 | [XmlIgnore] |
975 | public bool CreateSelected | 1002 | public bool CreateSelected |
976 | { | 1003 | { |
977 | get { return m_createSelected; } | 1004 | get { return m_createSelected; } |
978 | set { m_createSelected = value; } | 1005 | set { m_createSelected = value; } |
979 | } | 1006 | } |
980 | 1007 | ||
981 | #endregion | 1008 | #endregion |
982 | 1009 | ||
@@ -1527,6 +1554,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1527 | /// <summary> | 1554 | /// <summary> |
1528 | /// Duplicates this part. | 1555 | /// Duplicates this part. |
1529 | /// </summary> | 1556 | /// </summary> |
1557 | /// <param name="localID"></param> | ||
1558 | /// <param name="AgentID"></param> | ||
1559 | /// <param name="GroupID"></param> | ||
1560 | /// <param name="linkNum"></param> | ||
1561 | /// <param name="userExposed">True if the duplicate will immediately be in the scene, false otherwise</param> | ||
1530 | /// <returns></returns> | 1562 | /// <returns></returns> |
1531 | public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed) | 1563 | public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed) |
1532 | { | 1564 | { |
@@ -1590,7 +1622,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1590 | dupe.DoPhysicsPropertyUpdate(UsePhysics, true); | 1622 | dupe.DoPhysicsPropertyUpdate(UsePhysics, true); |
1591 | } | 1623 | } |
1592 | 1624 | ||
1593 | return dupe; | 1625 | ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed); |
1626 | |||
1627 | // m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); | ||
1628 | |||
1629 | return dupe; | ||
1594 | } | 1630 | } |
1595 | 1631 | ||
1596 | protected void AssetReceived(string id, Object sender, AssetBase asset) | 1632 | protected void AssetReceived(string id, Object sender, AssetBase asset) |