aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-28 22:07:58 +0000
committerJustin Clark-Casey (justincc)2013-03-28 22:07:58 +0000
commitc2093ccce16cd5210c8e0759f23b5b4bd205b7af (patch)
tree907cb903d1fae01a00e9dbb535aaadf230719428 /OpenSim/Region/CoreModules
parentAdd back a log message when we attempt a megaregion auto-reteleport (diff)
downloadopensim-SC_OLD-c2093ccce16cd5210c8e0759f23b5b4bd205b7af.zip
opensim-SC_OLD-c2093ccce16cd5210c8e0759f23b5b4bd205b7af.tar.gz
opensim-SC_OLD-c2093ccce16cd5210c8e0759f23b5b4bd205b7af.tar.bz2
opensim-SC_OLD-c2093ccce16cd5210c8e0759f23b5b4bd205b7af.tar.xz
Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary.
This is to simplify the code (no tricky 'wasChild' signalling required) and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers) and the viewer-side attaching the v3 viewers perform.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index ad17aa9..a46834c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
197 return; 197 return;
198 } 198 }
199 199
200// m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0}", sp.Name); 200// m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
201 201
202 List<AvatarAttachment> attachments = sp.Appearance.GetAttachments(); 202 List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
203 foreach (AvatarAttachment attach in attachments) 203 foreach (AvatarAttachment attach in attachments)