diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/world/Primitive.cs | 7 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/World.cs | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs index 8ff66f9..6fb5d72 100644 --- a/OpenSim.RegionServer/world/Primitive.cs +++ b/OpenSim.RegionServer/world/Primitive.cs | |||
@@ -52,7 +52,14 @@ namespace OpenSim.world | |||
52 | { | 52 | { |
53 | set | 53 | set |
54 | { | 54 | { |
55 | LLVector3 offset = (value - primData.Scale); | ||
56 | offset.X /= 2; | ||
57 | offset.Y /= 2; | ||
58 | offset.Z /= 2; | ||
59 | |||
60 | this.primData.Position += offset; | ||
55 | this.primData.Scale = value; | 61 | this.primData.Scale = value; |
62 | |||
56 | this.dirtyFlag = true; | 63 | this.dirtyFlag = true; |
57 | } | 64 | } |
58 | get | 65 | get |
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; |