diff options
| author | Melanie | 2012-10-17 00:13:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-17 00:13:49 +0100 |
| commit | 416bc19da7c9cd9b20931376bf1408820063816a (patch) | |
| tree | d1de81a29fbabe2870552473771b0b527194bef6 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix perms when linking an object. Set root part perms to the perms (diff) | |
| download | opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.zip opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.gz opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.bz2 opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 30bf744..deb57ce 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2506,6 +2506,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2506 | } | 2506 | } |
| 2507 | 2507 | ||
| 2508 | m_sceneGraph.LinkObjects(root, children); | 2508 | m_sceneGraph.LinkObjects(root, children); |
| 2509 | |||
| 2510 | ScenePresence sp; | ||
| 2511 | if (TryGetScenePresence(agentId, out sp)) | ||
| 2512 | { | ||
| 2513 | root.SendPropertiesToClient(sp.ControllingClient); | ||
| 2514 | } | ||
| 2509 | } | 2515 | } |
| 2510 | 2516 | ||
| 2511 | private string PermissionString(uint permissions) | 2517 | private string PermissionString(uint permissions) |