diff options
| author | Justin Clark-Casey (justincc) | 2010-03-12 22:49:16 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-03-12 22:49:16 +0000 |
| commit | 6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5 (patch) | |
| tree | 92e96744a5513db89b74ff8cd6e8f443e0c874f7 /OpenSim/Region/Framework/Scenes | |
| parent | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to Attachme... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.zip opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.tar.gz opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.tar.bz2 opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 8967252..a2b98b9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2044,6 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2044 | { | 2044 | { |
| 2045 | m_lastColliders.Remove(localID); | 2045 | m_lastColliders.Remove(localID); |
| 2046 | } | 2046 | } |
| 2047 | |||
| 2047 | if (m_parentGroup == null) | 2048 | if (m_parentGroup == null) |
| 2048 | return; | 2049 | return; |
| 2049 | if (m_parentGroup.IsDeleted) | 2050 | if (m_parentGroup.IsDeleted) |