aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-11 21:04:27 +0000
committerMelanie Thielker2009-05-11 21:04:27 +0000
commitf948fab4dab4330d7e94f7671f752e8993ce14ea (patch)
treea153039b7e9cf10ca6e2f740ab2e06dc1ca4ae81
parentCommit the asset server app config (diff)
downloadopensim-SC_OLD-f948fab4dab4330d7e94f7671f752e8993ce14ea.zip
opensim-SC_OLD-f948fab4dab4330d7e94f7671f752e8993ce14ea.tar.gz
opensim-SC_OLD-f948fab4dab4330d7e94f7671f752e8993ce14ea.tar.bz2
opensim-SC_OLD-f948fab4dab4330d7e94f7671f752e8993ce14ea.tar.xz
Add AssetService of type IAssetService to Scene
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs14
-rw-r--r--prebuild.xml1
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 72d1435..8de069a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -38,6 +38,7 @@ using Nini.Config;
38using OpenMetaverse; 38using OpenMetaverse;
39using OpenMetaverse.Imaging; 39using OpenMetaverse.Imaging;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Services.Interfaces;
41using OpenSim.Framework.Communications; 42using OpenSim.Framework.Communications;
42using OpenSim.Framework.Communications.Cache; 43using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Communications.Clients; 44using OpenSim.Framework.Communications.Clients;
@@ -125,6 +126,19 @@ namespace OpenSim.Region.Framework.Scenes
125 126
126 public IXfer XferManager; 127 public IXfer XferManager;
127 128
129 protected IAssetService m_AssetService = null;
130
131 public IAssetService AssetService
132 {
133 get
134 {
135 if (m_AssetService == null)
136 m_AssetService = RequestModuleInterface<IAssetService>();
137
138 return m_AssetService;
139 }
140 }
141
128 protected IXMLRPC m_xmlrpcModule; 142 protected IXMLRPC m_xmlrpcModule;
129 protected IWorldComm m_worldCommModule; 143 protected IWorldComm m_worldCommModule;
130 protected IAvatarFactory m_AvatarFactory; 144 protected IAvatarFactory m_AvatarFactory;
diff --git a/prebuild.xml b/prebuild.xml
index 85f2702..7b6c3fc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -655,6 +655,7 @@
655 <Reference name="OpenMetaverseTypes.dll"/> 655 <Reference name="OpenMetaverseTypes.dll"/>
656 <Reference name="OpenMetaverse.StructuredData.dll"/> 656 <Reference name="OpenMetaverse.StructuredData.dll"/>
657 <Reference name="OpenMetaverse.dll"/> 657 <Reference name="OpenMetaverse.dll"/>
658 <Reference name="OpenSim.Services.Interfaces"/>
658 <Reference name="OpenSim.Framework"/> 659 <Reference name="OpenSim.Framework"/>
659 <Reference name="OpenSim.Framework.Communications"/> 660 <Reference name="OpenSim.Framework.Communications"/>
660 <Reference name="OpenSim.Data" /> 661 <Reference name="OpenSim.Data" />