aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-10-29 20:40:48 +0100
committerMelanie2010-10-29 20:40:48 +0100
commit9331898c320d7d6046c6d1ad467cdee0e32c8b71 (patch)
tree917ff7facdeb38d96f5f69576a134cbad4776eae /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentMerge branch 'dev-appearance' (diff)
downloadopensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.zip
opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.gz
opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.bz2
opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c3edeb3..f0f8d55 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -120,7 +120,6 @@ namespace OpenSim.Region.Framework.Scenes
120 120
121 protected IXMLRPC m_xmlrpcModule; 121 protected IXMLRPC m_xmlrpcModule;
122 protected IWorldComm m_worldCommModule; 122 protected IWorldComm m_worldCommModule;
123 protected IAvatarFactory m_AvatarFactory;
124 protected IConfigSource m_config; 123 protected IConfigSource m_config;
125 protected IRegionSerialiserModule m_serialiser; 124 protected IRegionSerialiserModule m_serialiser;
126 protected IDialogModule m_dialogModule; 125 protected IDialogModule m_dialogModule;
@@ -415,11 +414,6 @@ namespace OpenSim.Region.Framework.Scenes
415 414
416 public IAttachmentsModule AttachmentsModule { get; set; } 415 public IAttachmentsModule AttachmentsModule { get; set; }
417 416
418 public IAvatarFactory AvatarFactory
419 {
420 get { return m_AvatarFactory; }
421 }
422
423 public ICapabilitiesModule CapsModule 417 public ICapabilitiesModule CapsModule
424 { 418 {
425 get { return m_capsModule; } 419 get { return m_capsModule; }
@@ -1193,7 +1187,6 @@ namespace OpenSim.Region.Framework.Scenes
1193 m_xmlrpcModule = RequestModuleInterface<IXMLRPC>(); 1187 m_xmlrpcModule = RequestModuleInterface<IXMLRPC>();
1194 m_worldCommModule = RequestModuleInterface<IWorldComm>(); 1188 m_worldCommModule = RequestModuleInterface<IWorldComm>();
1195 XferManager = RequestModuleInterface<IXfer>(); 1189 XferManager = RequestModuleInterface<IXfer>();
1196 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>();
1197 AttachmentsModule = RequestModuleInterface<IAttachmentsModule>(); 1190 AttachmentsModule = RequestModuleInterface<IAttachmentsModule>();
1198 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); 1191 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>();
1199 m_dialogModule = RequestModuleInterface<IDialogModule>(); 1192 m_dialogModule = RequestModuleInterface<IDialogModule>();