diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index b6043ac8f4..0ba3e7fbac 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs @@ -45,7 +45,6 @@ namespace OpenSim.Framework public interface IScene { RegionInfo RegionInfo { get; } - uint NextLocalId { get; } RegionStatus Region_Status { get; set; } ClientManager ClientManager { get; } diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index a1d8f67918..bf0e211aae 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs @@ -71,7 +71,6 @@ namespace OpenSim.Region.Environment.Scenes get { return m_eventManager; } } - protected SceneExternalChecks m_externalChecks; public SceneExternalChecks ExternalChecks { @@ -80,8 +79,6 @@ namespace OpenSim.Region.Environment.Scenes protected string m_datastore; - private uint m_nextLocalId = 8880000; - private AssetCache m_assetCache; public AssetCache AssetCache @@ -155,11 +152,6 @@ namespace OpenSim.Region.Environment.Scenes get { return m_regInfo; } } - public uint NextLocalId - { - get { return m_nextLocalId++; } - } - #region admin stuff /// diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 4adebc4841..65565a52d7 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -492,7 +492,6 @@ namespace OpenSim.Region.Environment.Scenes m_scene = world; m_uuid = client.AgentId; m_regionInfo = reginfo; - m_localId = m_scene.NextLocalId; IGroupsModule gm = m_scene.RequestModuleInterface(); if (gm != null) @@ -2214,8 +2213,6 @@ namespace OpenSim.Region.Environment.Scenes CrossAttachmentsIntoNewRegion(neighbourHandle, true); -// m_scene.SendKillObject(m_localId); - m_scene.NotifyMyCoarseLocationChange(); // the user may change their profile information in other region, // so the userinfo in UserProfileCache is not reliable any more, delete it @@ -2265,7 +2262,6 @@ namespace OpenSim.Region.Environment.Scenes /// public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) { - // if (!IsChildAgent) return;