OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Needs testing. 

1. Fixed Update Lock (should now compile)
2. Added support for rescaling a primitive without it jerking to the side.
0.1-prestable
Adam Frisby 2007-04-22 18:48:45 +00:00
parent 6103e06a34
commit 2194b74473
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim.RegionServer/SimClient.cs
View File

@ -735,8 +735,9 @@ namespace OpenSim
{ {
NeedAck.Add(Pack.Header.Sequence, Pack); NeedAck.Add(Pack.Header.Sequence, Pack);
} }
catch (Exception e) catch (Exception e) // HACKY
{ {
e.ToString();
// Ignore // Ignore
// Seems to throw a exception here occasionally // Seems to throw a exception here occasionally
// of 'duplicate key' despite being locked. // of 'duplicate key' despite being locked.

7
OpenSim.RegionServer/world/Primitive.cs
View File

@ -52,7 +52,14 @@ namespace OpenSim.world
{ {
set set
{ {
LLVector3 offset = (value - primData.Scale);
offset.X /= 2;
offset.Y /= 2;
offset.Z /= 2;
this.primData.Position += offset;
this.primData.Scale = value; this.primData.Scale = value;
this.dirtyFlag = true; this.dirtyFlag = true;
} }
get get

4
OpenSim.RegionServer/world/World.cs
View File

@ -41,7 +41,7 @@ namespace OpenSim.world
private string m_regionName; private string m_regionName;
private InventoryCache _inventoryCache; private InventoryCache _inventoryCache;
private AssetCache _assetCache; private AssetCache _assetCache;
private int updateLock; private Object updateLock;
/// <summary> /// <summary>
/// Creates a new World class, and a region to go with it. /// Creates a new World class, and a region to go with it.
@ -53,7 +53,7 @@ namespace OpenSim.world
{ {
try try
{ {
updateLock = 0; updateLock = null;
m_clientThreads = clientThreads; m_clientThreads = clientThreads;
m_regionHandle = regionHandle; m_regionHandle = regionHandle;
m_regionName = regionName; m_regionName = regionName;