Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2013-01-10 01:25:07 +00:00
15 changed files with 611 additions and 124 deletions

View File

@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks>
public bool IsRoot
{
get { return ParentGroup.RootPart == this; }
get { return Object.ReferenceEquals(ParentGroup.RootPart, this); }
}
/// <summary>