Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

1 files changed, 3 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index fa8b1c0..c45cfb8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2015,13 +2015,9 @@ namespace OpenSim.Region.Framework.Scenes
             axPos *= parentRot;
             Vector3 translationOffsetPosition = axPos;
             if(_parentID == 0)
-            {
-               return GroupPosition;
-            }
-            else
-            {
-                return ParentGroup.AbsolutePosition + translationOffsetPosition; //KF: Fix child prim position
-            }
+                return GroupPosition;
+            else
+                return ParentGroup.AbsolutePosition + translationOffsetPosition;
         }
 
         /// <summary>