aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorubit2012-11-02 11:21:25 +0100
committerubit2012-11-02 11:21:25 +0100
commit4565f05301ba182fbdf65d0d815543ae9f0b807e (patch)
tree3a872cd05ff345a9502ae22a2a11f9dc69323502 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent lock unique and uniqueReleased in same order when both locks are needed (diff)
downloadopensim-SC-4565f05301ba182fbdf65d0d815543ae9f0b807e.zip
opensim-SC-4565f05301ba182fbdf65d0d815543ae9f0b807e.tar.gz
opensim-SC-4565f05301ba182fbdf65d0d815543ae9f0b807e.tar.bz2
opensim-SC-4565f05301ba182fbdf65d0d815543ae9f0b807e.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index dd9210f..906c1ee 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -335,7 +335,7 @@ namespace OpenSim.Region.Framework.Scenes
335 { 335 {
336 // Needs to determine which engine was running it and use that 336 // Needs to determine which engine was running it and use that
337 // 337 //
338 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); 338 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 1);
339 } 339 }
340 340
341 // Tell anyone managing scripts that a script has been reloaded/changed 341 // Tell anyone managing scripts that a script has been reloaded/changed
@@ -2503,6 +2503,12 @@ namespace OpenSim.Region.Framework.Scenes
2503 } 2503 }
2504 2504
2505 m_sceneGraph.LinkObjects(root, children); 2505 m_sceneGraph.LinkObjects(root, children);
2506
2507 ScenePresence sp;
2508 if (TryGetScenePresence(agentId, out sp))
2509 {
2510 root.SendPropertiesToClient(sp.ControllingClient);
2511 }
2506 } 2512 }
2507 2513
2508 private string PermissionString(uint permissions) 2514 private string PermissionString(uint permissions)