aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world
diff options
context:
space:
mode:
authorlbsa712007-04-11 20:07:58 +0000
committerlbsa712007-04-11 20:07:58 +0000
commit1a28ef6292a152a69d0f53803daacc7dad522cea (patch)
tree3d4e2eed288b208f1d0db7d37e8f1d9a1dfca1c5 /OpenSim.RegionServer/world
parent* cleaning (diff)
downloadopensim-SC-1a28ef6292a152a69d0f53803daacc7dad522cea.zip
opensim-SC-1a28ef6292a152a69d0f53803daacc7dad522cea.tar.gz
opensim-SC-1a28ef6292a152a69d0f53803daacc7dad522cea.tar.bz2
opensim-SC-1a28ef6292a152a69d0f53803daacc7dad522cea.tar.xz
* Replaced GridHTTPServer and UserHTTPServer with BaseHttpServer
* Now dumping default value in config. *
Diffstat (limited to 'OpenSim.RegionServer/world')
-rw-r--r--OpenSim.RegionServer/world/Avatar.cs2
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs1
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index 843c3af..42a2067 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -32,7 +32,7 @@ namespace OpenSim.world
32 private ulong m_regionHandle; 32 private ulong m_regionHandle;
33 private Dictionary<uint, SimClient> m_clientThreads; 33 private Dictionary<uint, SimClient> m_clientThreads;
34 private string m_regionName; 34 private string m_regionName;
35 private bool childShadowAvatar = false; 35 //private bool childShadowAvatar = false;
36 36
37 public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle) 37 public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle)
38 { 38 {
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 4b26fbe..616dc25 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -22,7 +22,6 @@ namespace OpenSim.world
22 private bool physicsEnabled = false; 22 private bool physicsEnabled = false;
23 23
24 private Dictionary<LLUUID, InventoryItem> inventoryItems; 24 private Dictionary<LLUUID, InventoryItem> inventoryItems;
25 private string inventoryFileName = "";
26 25
27 #region Properties 26 #region Properties
28 27