Resolve merge commits, stage 1

This commit is contained in:
Tom
2011-09-04 07:06:36 -07:00
267 changed files with 19393 additions and 5645 deletions

View File

@@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
return;
}
part=part.ParentGroup.RootPart; // We detect objects only
part = part.ParentGroup.RootPart; // We detect objects only
LinkNum = 0; // Not relevant