diff options
author | Justin Clark-Casey (justincc) | 2012-05-15 23:43:59 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-15 23:43:59 +0100 |
commit | 1b5ce8c10e492308eeb44c82fee0c65cec855327 (patch) | |
tree | 699bb92bdb6b98be78d9933037961f5de8ede003 /OpenSim/Region/Framework | |
parent | Allow use of regular expressions in "show object name", "show part name" and ... (diff) | |
download | opensim-SC_OLD-1b5ce8c10e492308eeb44c82fee0c65cec855327.zip opensim-SC_OLD-1b5ce8c10e492308eeb44c82fee0c65cec855327.tar.gz opensim-SC_OLD-1b5ce8c10e492308eeb44c82fee0c65cec855327.tar.bz2 opensim-SC_OLD-1b5ce8c10e492308eeb44c82fee0c65cec855327.tar.xz |
Fix issue where loading OARs could sometimes result in link numbers being reordered.
This was because the parts in scene objects were sometimes not serialized in link order.
This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this
had not been done in the SerialiserModule methods that OAR loading used.
Add regression test for same.
Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f911ef8..1a940aa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -932,7 +932,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
932 | public int LinkNum | 932 | public int LinkNum |
933 | { | 933 | { |
934 | get { return m_linkNum; } | 934 | get { return m_linkNum; } |
935 | set { m_linkNum = value; } | 935 | set |
936 | { | ||
937 | // if (ParentGroup != null) | ||
938 | // { | ||
939 | // m_log.DebugFormat( | ||
940 | // "[SCENE OBJECT PART]: Setting linknum of {0}@{1} to {2} from {3}", | ||
941 | // Name, AbsolutePosition, value, m_linkNum); | ||
942 | // Util.PrintCallStack(); | ||
943 | // } | ||
944 | |||
945 | m_linkNum = value; | ||
946 | } | ||
936 | } | 947 | } |
937 | 948 | ||
938 | public byte ClickAction | 949 | public byte ClickAction |