aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
authorMW2007-05-13 12:25:08 +0000
committerMW2007-05-13 12:25:08 +0000
commit05d9593198f1a688e10ab5be1789b5661ad7d61e (patch)
treeec72812a389d6cccfbe9af39291e8128aa0ecf8a /OpenSim.RegionServer/world/World.cs
parent* Added first generation region DB for SQL-based grid storage engines. (diff)
downloadopensim-SC_OLD-05d9593198f1a688e10ab5be1789b5661ad7d61e.zip
opensim-SC_OLD-05d9593198f1a688e10ab5be1789b5661ad7d61e.tar.gz
opensim-SC_OLD-05d9593198f1a688e10ab5be1789b5661ad7d61e.tar.bz2
opensim-SC_OLD-05d9593198f1a688e10ab5be1789b5661ad7d61e.tar.xz
Added very basic support for maps (likely to only work in sandbox mode due to the non functioning remote asset server), also currently just uses textures that we already had added to the asset server (this is the first thing that needs fixing)
Diffstat (limited to 'OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim.RegionServer/world/World.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 225ce81..445df1d 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -43,7 +43,7 @@ namespace OpenSim.world
43 private InventoryCache _inventoryCache; 43 private InventoryCache _inventoryCache;
44 private AssetCache _assetCache; 44 private AssetCache _assetCache;
45 private Mutex updateLock; 45 private Mutex updateLock;
46 46 private RegionInfo m_regInfo;
47 public string m_datastore; 47 public string m_datastore;
48 48
49 /// <summary> 49 /// <summary>
@@ -52,7 +52,7 @@ namespace OpenSim.world
52 /// <param name="clientThreads">Dictionary to contain client threads</param> 52 /// <param name="clientThreads">Dictionary to contain client threads</param>
53 /// <param name="regionHandle">Region Handle for this region</param> 53 /// <param name="regionHandle">Region Handle for this region</param>
54 /// <param name="regionName">Region Name for this region</param> 54 /// <param name="regionName">Region Name for this region</param>
55 public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName) 55 public World(Dictionary<uint, SimClient> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)
56 { 56 {
57 try 57 try
58 { 58 {
@@ -60,6 +60,7 @@ namespace OpenSim.world
60 m_clientThreads = clientThreads; 60 m_clientThreads = clientThreads;
61 m_regionHandle = regionHandle; 61 m_regionHandle = regionHandle;
62 m_regionName = regionName; 62 m_regionName = regionName;
63 m_regInfo = regInfo;
63 64
64 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); 65 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
65 m_scripts = new Dictionary<string, ScriptFactory>(); 66 m_scripts = new Dictionary<string, ScriptFactory>();