diff options
author | Melanie | 2010-10-21 17:09:42 +0100 |
---|---|---|
committer | Melanie | 2010-10-21 17:09:42 +0100 |
commit | 08e14d653e826b72300215dba8816abcc6a9e6ec (patch) | |
tree | 44aadaad5d7c3bde10b1ec6452e1e507d4df047e /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Make SImStatsReporter pick ObjectCapacity striaght out of region info (diff) | |
parent | Major refactoring of appearance handling. (diff) | |
download | opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.zip opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.gz opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.bz2 opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.xz |
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c9ae558..6ed08f3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -119,7 +119,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
119 | 119 | ||
120 | protected IXMLRPC m_xmlrpcModule; | 120 | protected IXMLRPC m_xmlrpcModule; |
121 | protected IWorldComm m_worldCommModule; | 121 | protected IWorldComm m_worldCommModule; |
122 | protected IAvatarFactory m_AvatarFactory; | ||
123 | protected IConfigSource m_config; | 122 | protected IConfigSource m_config; |
124 | protected IRegionSerialiserModule m_serialiser; | 123 | protected IRegionSerialiserModule m_serialiser; |
125 | protected IDialogModule m_dialogModule; | 124 | protected IDialogModule m_dialogModule; |
@@ -399,11 +398,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
399 | 398 | ||
400 | public IAttachmentsModule AttachmentsModule { get; set; } | 399 | public IAttachmentsModule AttachmentsModule { get; set; } |
401 | 400 | ||
402 | public IAvatarFactory AvatarFactory | ||
403 | { | ||
404 | get { return m_AvatarFactory; } | ||
405 | } | ||
406 | |||
407 | public ICapabilitiesModule CapsModule | 401 | public ICapabilitiesModule CapsModule |
408 | { | 402 | { |
409 | get { return m_capsModule; } | 403 | get { return m_capsModule; } |
@@ -1159,7 +1153,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1159 | m_xmlrpcModule = RequestModuleInterface<IXMLRPC>(); | 1153 | m_xmlrpcModule = RequestModuleInterface<IXMLRPC>(); |
1160 | m_worldCommModule = RequestModuleInterface<IWorldComm>(); | 1154 | m_worldCommModule = RequestModuleInterface<IWorldComm>(); |
1161 | XferManager = RequestModuleInterface<IXfer>(); | 1155 | XferManager = RequestModuleInterface<IXfer>(); |
1162 | m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); | ||
1163 | AttachmentsModule = RequestModuleInterface<IAttachmentsModule>(); | 1156 | AttachmentsModule = RequestModuleInterface<IAttachmentsModule>(); |
1164 | m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); | 1157 | m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); |
1165 | m_dialogModule = RequestModuleInterface<IDialogModule>(); | 1158 | m_dialogModule = RequestModuleInterface<IDialogModule>(); |