Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index c07fc73..e4bacd4 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -332,7 +332,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 
                 grp.IsAttachment = false;
                 // Required for linking
-                grp.RootPart.UpdateFlag = 0;
+                grp.RootPart.ClearUpdateSchedule();
                 
                 if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos))
                 {
@@ -345,8 +345,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
             for (int j = 1; j < allparts.Length; j++)
             {
-                rootGroup.RootPart.UpdateFlag = 0;
-                allparts[j].RootPart.UpdateFlag = 0;
+                // Required for linking
+                rootGroup.RootPart.ClearUpdateSchedule();
+                allparts[j].RootPart.ClearUpdateSchedule();
                 rootGroup.LinkToGroup(allparts[j]);
             }