2 files changed, 29 insertions, 4 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 40ebed1..bb76717 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11631,8 +11631,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                                     udata.scale = new Vector3(block.Data, 0);
 
-                                    //                                    udata.change = ObjectChangeType.groupS;
-                                    udata.change = ObjectChangeType.primS; // to conform to current SL
+                                    udata.change = ObjectChangeType.groupS;
                                     updatehandler(localId, udata, this);
 
                                     break;
@@ -11643,8 +11642,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                     udata.position = new Vector3(block.Data, 0);
                                     udata.scale = new Vector3(block.Data, 12);
 
-                                    //                                    udata.change = ObjectChangeType.groupPS;
-                                    udata.change = ObjectChangeType.primPS; // to conform to current SL
+                                    udata.change = ObjectChangeType.groupPS;
                                     updatehandler(localId, udata, this);
                                     break;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index d4965ea..0d178c3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1273,9 +1273,36 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (m_parentScene.Permissions.CanEditObject(grp.UUID, remoteClient.AgentId))
                     {
+                        // These two are exceptions SL makes in the interpretation
+                        // of the change flags. Must check them here because otherwise
+                        // the group flag (see below) would be lost
+                        if (data.change == ObjectChangeType.groupS)
+                            data.change = ObjectChangeType.primS;
+                        if (data.change == ObjectChangeType.groupPS)
+                            data.change = ObjectChangeType.primPS;
                         part.StoreUndoState(data.change); // lets test only saving what we changed
                         grp.doChangeObject(part, (ObjectChangeData)data);
                     }
+                    else
+                    {
+                        // Is this any kind of group operation?
+                        if ((data.change & ObjectChangeType.Group) != 0)
+                        {
+                            // Is a move and/or rotation requested?
+                            if ((data.change & (ObjectChangeType.Position | ObjectChangeType.Rotation)) != 0)
+                            {
+                                // Are we allowed to move it?
+                                if (m_parentScene.Permissions.CanMoveObject(grp.UUID, remoteClient.AgentId))
+                                {
+                                    // Strip all but move and rotation from request
+                                    data.change &= (ObjectChangeType.Group | ObjectChangeType.Position | ObjectChangeType.Rotation);
+
+                                    part.StoreUndoState(data.change);
+                                    grp.doChangeObject(part, (ObjectChangeData)data);
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }