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

Finally make attachments stay put. Randomize local ID generation to 

prevent adjacent sims from using identical Local IDs for the attachment
Thanks to Mana Janus (Hippo Viewer) for providing the crucial bit of
information, namely that, due to a bug in the viewer, adjacent sims can't
use the same local ids.
0.6.1-post-fixes
Melanie Thielker 2008-11-29 13:17:21 +00:00
parent a00d346aab
commit 1b3a3ffc77
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/IScene.cs
View File

@ -57,7 +57,6 @@ namespace OpenSim.Framework
public interface IScene
{
RegionInfo RegionInfo { get; }
uint NextAvatarLocalId { get; }
RegionStatus Region_Status { get; set; }
ClientManager ClientManager { get; }

7
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
View File

@ -556,7 +556,12 @@ namespace OpenSim.Region.Environment.Modules.World.Land
}
lock (m_landList)
{
return m_landList[m_landIDList[x, y]];
// Corner case. If an autoreturn happens during sim startup
// we will come here with the list uninitialized
//
if (m_landList.ContainsKey(m_landIDList[x, y]))
return m_landList[m_landIDList[x, y]];
return null;
}
}

7
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -269,6 +269,8 @@ namespace OpenSim.Region.Environment.Scenes
{
m_config = config;
Random random = new Random();
m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4);
m_moduleLoader = moduleLoader;
m_authenticateHandler = authen;
CommsManager = commsMan;
@ -2182,12 +2184,12 @@ namespace OpenSim.Region.Environment.Scenes
//
SceneObjectPart RootPrim = GetSceneObjectPart(primID);
RootPrim.SetParentLocalId(parentLocalID);
if (RootPrim != null)
{
SceneObjectGroup grp = RootPrim.ParentGroup;
RootPrim.SetParentLocalId(parentLocalID);
if (grp != null)
{
m_log.DebugFormat("[ATTACHMENT]: Received "+
@ -2205,6 +2207,7 @@ namespace OpenSim.Region.Environment.Scenes
grp.LocalId, (uint)0,
grp.GroupRotation,
grp.AbsolutePosition, false);
grp.SendGroupFullUpdate();
}
else
{

9
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Scenes
/// The last allocated local prim id. When a new local id is requested, the next number in the sequence is
/// dispensed.
/// </summary>
private uint m_lastAllocatedLocalId = 720000;
protected uint m_lastAllocatedLocalId = 720000;
private readonly Mutex _primAllocateMutex = new Mutex(false);
@ -92,8 +92,6 @@ namespace OpenSim.Region.Environment.Scenes
protected string m_datastore;
private uint m_nextAvatarLocalId = 8880000;
private AssetCache m_assetCache;
public AssetCache AssetCache
@ -167,11 +165,6 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_regInfo; }
}
public uint NextAvatarLocalId
{
get { return m_nextAvatarLocalId++; }
}
#region admin stuff
/// <summary>

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -508,7 +508,7 @@ namespace OpenSim.Region.Environment.Scenes
m_scene = world;
m_uuid = client.AgentId;
m_regionInfo = reginfo;
m_localId = m_scene.NextAvatarLocalId;
m_localId = m_scene.AllocateLocalId();
IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
if (gm != null)