aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Examples/SimpleApp/MyWorld.cs
diff options
context:
space:
mode:
authorMW2007-06-22 22:21:08 +0000
committerMW2007-06-22 22:21:08 +0000
commitd7121a422a334f20e96d09251cf7382164b590db (patch)
tree64ebfea926bc57569963bd1a8adc16e71c942ab1 /OpenSim/Examples/SimpleApp/MyWorld.cs
parentImported Share folder from trunk (diff)
downloadopensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.zip
opensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.tar.gz
opensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.tar.bz2
opensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.tar.xz
Started work on CAPS support, now we have our first test capability, MapLayer requests are handled by CAPS.
Diffstat (limited to 'OpenSim/Examples/SimpleApp/MyWorld.cs')
-rw-r--r--OpenSim/Examples/SimpleApp/MyWorld.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
index 334b6af..477d29d 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -11,6 +11,7 @@ using OpenSim.Region.Scenes;
11using OpenSim.Framework; 11using OpenSim.Framework;
12using OpenSim.Caches; 12using OpenSim.Caches;
13using OpenGrid.Framework.Communications; 13using OpenGrid.Framework.Communications;
14using OpenSim.Servers;
14 15
15namespace SimpleApp 16namespace SimpleApp
16{ 17{
@@ -19,8 +20,8 @@ namespace SimpleApp
19 private RegionInfo m_regionInfo; 20 private RegionInfo m_regionInfo;
20 private List<OpenSim.Region.Scenes.ScenePresence> m_avatars; 21 private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
21 22
22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach) 23 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
23 : base(clientThreads, regionInfo, authen, commsMan, assetCach) 24 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
24 { 25 {
25 m_regionInfo = regionInfo; 26 m_regionInfo = regionInfo;
26 m_avatars = new List<Avatar>(); 27 m_avatars = new List<Avatar>();