diff options
author | Justin Clark-Casey (justincc) | 2010-03-05 23:18:47 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-03-05 23:18:47 +0000 |
commit | 60553e62a3f576b8bf6ab88a83b2d4550bd69d2b (patch) | |
tree | 3e24624d846502dda17fdac827f070273fafba26 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | automatically delete %temp% directory after running tests (diff) | |
download | opensim-SC-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.zip opensim-SC-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.tar.gz opensim-SC-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.tar.bz2 opensim-SC-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.tar.xz |
refactor: begin to move attachments code into a region module
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a880fe7..c83132f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -307,6 +307,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
307 | 307 | ||
308 | protected IXMLRPC m_xmlrpcModule; | 308 | protected IXMLRPC m_xmlrpcModule; |
309 | protected IWorldComm m_worldCommModule; | 309 | protected IWorldComm m_worldCommModule; |
310 | public IAttachmentsModule AttachmentsModule { get; set; } | ||
310 | protected IAvatarFactory m_AvatarFactory; | 311 | protected IAvatarFactory m_AvatarFactory; |
311 | public IAvatarFactory AvatarFactory | 312 | public IAvatarFactory AvatarFactory |
312 | { | 313 | { |
@@ -1215,6 +1216,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1215 | m_worldCommModule = RequestModuleInterface<IWorldComm>(); | 1216 | m_worldCommModule = RequestModuleInterface<IWorldComm>(); |
1216 | XferManager = RequestModuleInterface<IXfer>(); | 1217 | XferManager = RequestModuleInterface<IXfer>(); |
1217 | m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); | 1218 | m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); |
1219 | AttachmentsModule = RequestModuleInterface<IAttachmentsModule>(); | ||
1218 | m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); | 1220 | m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); |
1219 | m_dialogModule = RequestModuleInterface<IDialogModule>(); | 1221 | m_dialogModule = RequestModuleInterface<IDialogModule>(); |
1220 | m_capsModule = RequestModuleInterface<ICapabilitiesModule>(); | 1222 | m_capsModule = RequestModuleInterface<ICapabilitiesModule>(); |
@@ -2405,9 +2407,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2405 | //grp.SetFromAssetID(grp.RootPart.LastOwnerID); | 2407 | //grp.SetFromAssetID(grp.RootPart.LastOwnerID); |
2406 | m_log.DebugFormat( | 2408 | m_log.DebugFormat( |
2407 | "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); | 2409 | "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); |
2410 | |||
2411 | if (AttachmentsModule != null) | ||
2412 | AttachmentsModule.AttachObject( | ||
2413 | sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); | ||
2408 | 2414 | ||
2409 | AttachObject( | ||
2410 | sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); | ||
2411 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2415 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2412 | grp.SendGroupFullUpdate(); | 2416 | grp.SendGroupFullUpdate(); |
2413 | } | 2417 | } |