diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 69ef9b4..71e1536 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -950,7 +950,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
950 | if (objectGroup.RootPart.UpdateFlag > 0) | 950 | if (objectGroup.RootPart.UpdateFlag > 0) |
951 | { | 951 | { |
952 | // I've never actually seen this happen, though I think it's theoretically possible | 952 | // I've never actually seen this happen, though I think it's theoretically possible |
953 | m_log.ErrorFormat( | 953 | m_log.WarnFormat( |
954 | "[SCENE OBJECT GROUP]: Aborted linking {0}, {1} to {2}, {3} as it has yet to finish delinking", | 954 | "[SCENE OBJECT GROUP]: Aborted linking {0}, {1} to {2}, {3} as it has yet to finish delinking", |
955 | objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); | 955 | objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); |
956 | 956 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 6a19eb6..4614709 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1117,7 +1117,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1117 | 1117 | ||
1118 | // If multiple updates are scheduled on the same second, we still need to perform all of them | 1118 | // If multiple updates are scheduled on the same second, we still need to perform all of them |
1119 | // So we'll force the issue by bumping up the timestamp so that later processing sees these need | 1119 | // So we'll force the issue by bumping up the timestamp so that later processing sees these need |
1120 | // to be peformed. | 1120 | // to be performed. |
1121 | if (timeNow <= TimeStampFull) | 1121 | if (timeNow <= TimeStampFull) |
1122 | { | 1122 | { |
1123 | TimeStampFull += 1; | 1123 | TimeStampFull += 1; |