diff options
| author | Melanie | 2009-10-15 21:16:05 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-15 21:16:05 +0100 |
| commit | 642084c2a94523fa1dbe00e8c787d4da549881ca (patch) | |
| tree | 8af3f8bbbd01ddfbc22980291ada1cf896ddf948 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | minor: Change commented out authentication service realm setting to "users" t... (diff) | |
| download | opensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.zip opensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.gz opensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.bz2 opensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fba9ea8..4c7850f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2481,7 +2481,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2481 | if (aCircuit == null || aCircuit.child == false) | 2481 | if (aCircuit == null || aCircuit.child == false) |
| 2482 | { | 2482 | { |
| 2483 | sp.IsChildAgent = false; | 2483 | sp.IsChildAgent = false; |
| 2484 | sp.RezAttachments(); | 2484 | Util.FireAndForget(delegate(object o) { sp.RezAttachments(); }); |
| 2485 | } | 2485 | } |
| 2486 | } | 2486 | } |
| 2487 | 2487 | ||