From 1b3a3ffc7781a468f40841ee291d3f1e0fe22957 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 29 Nov 2008 13:17:21 +0000 Subject: 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. --- OpenSim/Region/Environment/Scenes/SceneBase.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/SceneBase.cs') diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 6d1e808..805ca5d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs @@ -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. /// - 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 /// -- cgit v1.1