diff options
| author | Melanie | 2013-01-10 01:25:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-10 01:25:07 +0000 |
| commit | aecb32b74efa5b74adcfc026f7261f43ad5934f4 (patch) | |
| tree | 8c775eca7460a5c5c2bc08e25d2334897e693673 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Change IsRoot to use ReferenceEquals to prevent operator == messiness (diff) | |
| download | opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.zip opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.gz opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.bz2 opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 54e3b2d..a5ef2b7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2982,6 +2982,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2982 | // start the scripts again (since this is done in RezAttachments()). | 2982 | // start the scripts again (since this is done in RezAttachments()). |
| 2983 | // XXX: This is convoluted. | 2983 | // XXX: This is convoluted. |
| 2984 | sp.IsChildAgent = false; | 2984 | sp.IsChildAgent = false; |
| 2985 | sp.IsLoggingIn = true; | ||
| 2985 | 2986 | ||
| 2986 | if (AttachmentsModule != null) | 2987 | if (AttachmentsModule != null) |
| 2987 | Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); }); | 2988 | Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); }); |