diff options
author | Adam Frisby | 2007-04-22 18:48:45 +0000 |
---|---|---|
committer | Adam Frisby | 2007-04-22 18:48:45 +0000 |
commit | 2194b744734bc21f9d9285d18d47164eef4baffa (patch) | |
tree | 44c2d61934540e14b3aceec68b8db39be0f65335 /OpenSim.RegionServer/world/World.cs | |
parent | Added lock around World.Update to prevent multiple updates occuring simultane... (diff) | |
download | opensim-SC-2194b744734bc21f9d9285d18d47164eef4baffa.zip opensim-SC-2194b744734bc21f9d9285d18d47164eef4baffa.tar.gz opensim-SC-2194b744734bc21f9d9285d18d47164eef4baffa.tar.bz2 opensim-SC-2194b744734bc21f9d9285d18d47164eef4baffa.tar.xz |
Needs testing.
1. Fixed Update Lock (should now compile)
2. Added support for rescaling a primitive without it jerking to the side.
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/world/World.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index 0291467..b0392a6 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.world | |||
41 | private string m_regionName; | 41 | private string m_regionName; |
42 | private InventoryCache _inventoryCache; | 42 | private InventoryCache _inventoryCache; |
43 | private AssetCache _assetCache; | 43 | private AssetCache _assetCache; |
44 | private int updateLock; | 44 | private Object updateLock; |
45 | 45 | ||
46 | /// <summary> | 46 | /// <summary> |
47 | /// Creates a new World class, and a region to go with it. | 47 | /// Creates a new World class, and a region to go with it. |
@@ -53,7 +53,7 @@ namespace OpenSim.world | |||
53 | { | 53 | { |
54 | try | 54 | try |
55 | { | 55 | { |
56 | updateLock = 0; | 56 | updateLock = null; |
57 | m_clientThreads = clientThreads; | 57 | m_clientThreads = clientThreads; |
58 | m_regionHandle = regionHandle; | 58 | m_regionHandle = regionHandle; |
59 | m_regionName = regionName; | 59 | m_regionName = regionName; |