aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
3 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index ff54ed3..972491d 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -321,6 +321,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
321 321
322 public event ActivateGesture OnActivateGesture; 322 public event ActivateGesture OnActivateGesture;
323 public event DeactivateGesture OnDeactivateGesture; 323 public event DeactivateGesture OnDeactivateGesture;
324 public event ObjectOwner OnObjectOwner;
324 325
325 public event DirPlacesQuery OnDirPlacesQuery; 326 public event DirPlacesQuery OnDirPlacesQuery;
326 327
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 729572a..04076da 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2340,5 +2340,21 @@ namespace OpenSim.Region.Environment.Scenes
2340 { 2340 {
2341 EventManager.TriggerGetScriptRunning(controllingClient, objectID, itemID); 2341 EventManager.TriggerGetScriptRunning(controllingClient, objectID, itemID);
2342 } 2342 }
2343
2344 void ObjectOwner(IClientAPI remoteClient, UUID ownerID, UUID groupID, List<uint> localIDs)
2345 {
2346 if (!ExternalChecks.ExternalChecksCanBeGodLike(remoteClient.AgentId))
2347 return;
2348
2349 foreach (uint localID in localIDs)
2350 {
2351 SceneObjectPart part = GetSceneObjectPart(localID);
2352 if (part != null && part.ParentGroup != null)
2353 {
2354 part.ParentGroup.SetOwnerId(ownerID);
2355 part.ParentGroup.SetGroup(groupID, remoteClient);
2356 }
2357 }
2358 }
2343 } 2359 }
2344} 2360}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fcd50a9..735de7e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2227,6 +2227,8 @@ namespace OpenSim.Region.Environment.Scenes
2227 client.OnActivateGesture += ActivateGesture; 2227 client.OnActivateGesture += ActivateGesture;
2228 client.OnDeactivateGesture += DeactivateGesture; 2228 client.OnDeactivateGesture += DeactivateGesture;
2229 2229
2230 client.OnObjectOwner += ObjectOwner;
2231
2230 // EventManager.TriggerOnNewClient(client); 2232 // EventManager.TriggerOnNewClient(client);
2231 } 2233 }
2232 2234