* Minor - error message should be a warning. Spelling
parent
87067bff1e
commit
9341c71135
|
@ -950,7 +950,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
if (objectGroup.RootPart.UpdateFlag > 0)
|
if (objectGroup.RootPart.UpdateFlag > 0)
|
||||||
{
|
{
|
||||||
// I've never actually seen this happen, though I think it's theoretically possible
|
// I've never actually seen this happen, though I think it's theoretically possible
|
||||||
m_log.ErrorFormat(
|
m_log.WarnFormat(
|
||||||
"[SCENE OBJECT GROUP]: Aborted linking {0}, {1} to {2}, {3} as it has yet to finish delinking",
|
"[SCENE OBJECT GROUP]: Aborted linking {0}, {1} to {2}, {3} as it has yet to finish delinking",
|
||||||
objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
|
objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
|
||||||
|
|
||||||
|
|
|
@ -1117,7 +1117,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
// If multiple updates are scheduled on the same second, we still need to perform all of them
|
// If multiple updates are scheduled on the same second, we still need to perform all of them
|
||||||
// So we'll force the issue by bumping up the timestamp so that later processing sees these need
|
// So we'll force the issue by bumping up the timestamp so that later processing sees these need
|
||||||
// to be peformed.
|
// to be performed.
|
||||||
if (timeNow <= TimeStampFull)
|
if (timeNow <= TimeStampFull)
|
||||||
{
|
{
|
||||||
TimeStampFull += 1;
|
TimeStampFull += 1;
|
||||||
|
|
Loading…
Reference in New Issue