Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneViewer.cs

1 files changed, 10 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e668790..149d2d3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2657,6 +2657,16 @@ namespace OpenSim.Region.Framework.Scenes
                     land.SendLandUpdateToClient(client);
                 }
             }
+
+            // Send all scene object to the new client
+            Util.FireAndForget(delegate
+            {
+                Entities.ForEach(delegate(EntityBase e)
+                {
+                    if (e != null && e is SceneObjectGroup)
+                        ((SceneObjectGroup)e).SendFullUpdateToClient(client);
+                });
+            });
         }
 
         /// <summary>