aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index d9162d4..1117324 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Scenes
92 92
93 public event SceneGroupMoved OnSceneGroupMove; 93 public event SceneGroupMoved OnSceneGroupMove;
94 94
95 public delegate void SceneGroupGrabed(LLUUID groupID, LLVector3 offset); 95 public delegate void SceneGroupGrabed(LLUUID groupID, LLVector3 offset, LLUUID userID);
96 96
97 public event SceneGroupGrabed OnSceneGroupGrab; 97 public event SceneGroupGrabed OnSceneGroupGrab;
98 98
@@ -198,11 +198,11 @@ namespace OpenSim.Region.Environment.Scenes
198 } 198 }
199 } 199 }
200 200
201 public void TriggerGroupGrab(LLUUID groupID, LLVector3 offset) 201 public void TriggerGroupGrab(LLUUID groupID, LLVector3 offset, LLUUID userID)
202 { 202 {
203 if (OnSceneGroupGrab != null) 203 if (OnSceneGroupGrab != null)
204 { 204 {
205 OnSceneGroupGrab(groupID, offset); 205 OnSceneGroupGrab(groupID, offset, userID);
206 } 206 }
207 } 207 }
208 } 208 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index f1930ea..9f8ea0c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1318,7 +1318,7 @@ namespace OpenSim.Region.Environment.Scenes
1318 1318
1319 public virtual void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient) 1319 public virtual void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient)
1320 { 1320 {
1321 m_scene.EventManager.TriggerGroupGrab(this.UUID, offsetPos); 1321 m_scene.EventManager.TriggerGroupGrab(this.UUID, offsetPos, remoteClient.AgentId);
1322 } 1322 }
1323 1323
1324 public void DeleteGroup() 1324 public void DeleteGroup()