diff options
author | Justin Clarke Casey | 2008-03-14 18:51:51 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-14 18:51:51 +0000 |
commit | 1641e4ecb1135ad5255f7614b7530d3763fd2768 (patch) | |
tree | 95ade4bf55d34375f004f85b9fa09993b3deadc4 /OpenSim/Region | |
parent | * Minor - error message should be a warning. Spelling (diff) | |
download | opensim-SC_OLD-1641e4ecb1135ad5255f7614b7530d3763fd2768.zip opensim-SC_OLD-1641e4ecb1135ad5255f7614b7530d3763fd2768.tar.gz opensim-SC_OLD-1641e4ecb1135ad5255f7614b7530d3763fd2768.tar.bz2 opensim-SC_OLD-1641e4ecb1135ad5255f7614b7530d3763fd2768.tar.xz |
* Remove stupid bug I just introduced where delinking would only delink one prim at a time.
* Teaches me not to say stuff like 'this is now working'
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 71e1536..3101b5a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1027,18 +1027,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1027 | /// </summary> | 1027 | /// </summary> |
1028 | /// <param name="partID"></param> | 1028 | /// <param name="partID"></param> |
1029 | public void DelinkFromGroup(uint partID) | 1029 | public void DelinkFromGroup(uint partID) |
1030 | { | 1030 | { |
1031 | // Don't try and update if we're already in the middle of updating | ||
1032 | if (RootPart.UpdateFlag > 0) | ||
1033 | { | ||
1034 | // I've never actually seen this happen, though I think it's theoretically possible | ||
1035 | m_log.WarnFormat( | ||
1036 | "[SCENE OBJECT GROUP]: Aborted delink update for {0}, {1} as it has yet to finish linking", | ||
1037 | RootPart.Name, RootPart.UUID); | ||
1038 | |||
1039 | return; | ||
1040 | } | ||
1041 | |||
1042 | SceneObjectPart linkPart = GetChildPart(partID); | 1031 | SceneObjectPart linkPart = GetChildPart(partID); |
1043 | 1032 | ||
1044 | if (null != linkPart) | 1033 | if (null != linkPart) |