diff options
author | Melanie Thielker | 2008-07-19 04:05:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-19 04:05:34 +0000 |
commit | bcf74416a1677584c069e4e0b9acf9015d8c5b6c (patch) | |
tree | 8c0b967fafbc21e93974760c0b32a0dd2119b930 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | Introduce a separate connection string for estates, which defaults to the one gi (diff) | |
download | opensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.zip opensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.tar.gz opensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.tar.bz2 opensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.tar.xz |
Fix prim link numbers (Mantis #1781)
Implements additional unlink modes (unlink root prim from link set, some
multi-set operations). Linking (single and mutiple) fully implemented.
Consistent numbering of links while in world. Link/delink with predictable
link numbering. Correct link numbers in LSL.
Not all multi-set ops implemented. Link numbers still change when taken and
re-rezzed.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 63ec23c..edccbe5 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -674,12 +674,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
674 | public int LinkNum | 674 | public int LinkNum |
675 | { | 675 | { |
676 | get { return m_linkNum; } | 676 | get { return m_linkNum; } |
677 | set | 677 | set { m_linkNum = value; } |
678 | { | ||
679 | m_linkNum = value; | ||
680 | TriggerScriptChangedEvent(Changed.LINK); | ||
681 | |||
682 | } | ||
683 | } | 678 | } |
684 | 679 | ||
685 | public byte ClickAction | 680 | public byte ClickAction |
@@ -2250,7 +2245,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2250 | public void SetAvatarOnSitTarget(LLUUID avatarID) | 2245 | public void SetAvatarOnSitTarget(LLUUID avatarID) |
2251 | { | 2246 | { |
2252 | m_sitTargetAvatar = avatarID; | 2247 | m_sitTargetAvatar = avatarID; |
2253 | TriggerScriptChangedEvent(Changed.LINK); | 2248 | if(ParentGroup != null) |
2249 | ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | ||
2254 | } | 2250 | } |
2255 | 2251 | ||
2256 | public void SetAxisRotation(int axis, int rotate) | 2252 | public void SetAxisRotation(int axis, int rotate) |
@@ -3294,4 +3290,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
3294 | 3290 | ||
3295 | #endregion Public Methods | 3291 | #endregion Public Methods |
3296 | } | 3292 | } |
3297 | } \ No newline at end of file | 3293 | } |