From 47e3d4d1f08b2aec45a57b985a2608defe07ca19 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 7 Nov 2008 21:33:11 +0000
Subject: * Remove next local id from SceneBase * This was only reference by
 ScenePresence and not used anyway - Scene itself had it's own copy

---
 OpenSim/Region/Environment/Scenes/SceneBase.cs     | 8 --------
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 4 ----
 2 files changed, 12 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index a1d8f67..bf0e211 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
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 4adebc4..65565a5 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<IGroupsModule>();
             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
         /// </summary>
         public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
         {
-            //
             if (!IsChildAgent)
                 return;
 
-- 
cgit v1.1