diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 1be1d2b437..f45c56571b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1939,7 +1939,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="region"></param>
         public void EnableChildAgent(ScenePresence sp, GridRegion region)
         {           
-            int viewrange =(int) sp.RegionViewDistance;
+            int viewrange = (int)sp.RegionViewDistance;
+            if(viewrange == 0)
+                return;
+
             Vector3 pos = sp.AbsolutePosition;
             RegionInfo curregion = sp.Scene.RegionInfo;
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 780e96317d..5126995f7a 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1388,10 +1388,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     return;
 
                                 agent.DropOldNeighbours(old);
-
-                                if(agent.RegionViewDistance == 0)
-                                    return;
-                            
+                           
                                 EntityTransferModule.EnableChildAgent(agent, otherRegion);
                             });
                         }