Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-02-16 02:41:49 +00:00
12 changed files with 116 additions and 42 deletions

View File

@@ -2142,7 +2142,7 @@ namespace OpenSim.Region.Framework.Scenes
{
Quaternion newRot;
if (this.LinkNum < 2) //KF Single or root prim
if (this.LinkNum == 0 || this.LinkNum == 1)
{
newRot = RotationOffset;
}