* Remove next local id from SceneBase
* This was only reference by ScenePresence and not used anyway - Scene itself had it's own copy0.6.0-stable
							parent
							
								
									a943b7dc7d
								
							
						
					
					
						commit
						47e3d4d1f0
					
				| 
						 | 
					@ -45,7 +45,6 @@ namespace OpenSim.Framework
 | 
				
			||||||
    public interface IScene
 | 
					    public interface IScene
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        RegionInfo RegionInfo { get; }
 | 
					        RegionInfo RegionInfo { get; }
 | 
				
			||||||
        uint NextLocalId { get; }
 | 
					 | 
				
			||||||
        RegionStatus Region_Status { get; set; }
 | 
					        RegionStatus Region_Status { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        ClientManager ClientManager { get; }
 | 
					        ClientManager ClientManager { get; }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -71,7 +71,6 @@ namespace OpenSim.Region.Environment.Scenes
 | 
				
			||||||
            get { return m_eventManager; }
 | 
					            get { return m_eventManager; }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
        protected SceneExternalChecks m_externalChecks;
 | 
					        protected SceneExternalChecks m_externalChecks;
 | 
				
			||||||
        public SceneExternalChecks ExternalChecks
 | 
					        public SceneExternalChecks ExternalChecks
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
| 
						 | 
					@ -80,8 +79,6 @@ namespace OpenSim.Region.Environment.Scenes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        protected string m_datastore;
 | 
					        protected string m_datastore;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private uint m_nextLocalId = 8880000;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        private AssetCache m_assetCache;
 | 
					        private AssetCache m_assetCache;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public AssetCache AssetCache
 | 
					        public AssetCache AssetCache
 | 
				
			||||||
| 
						 | 
					@ -155,11 +152,6 @@ namespace OpenSim.Region.Environment.Scenes
 | 
				
			||||||
            get { return m_regInfo; }
 | 
					            get { return m_regInfo; }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public uint NextLocalId
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            get { return m_nextLocalId++; }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        #region admin stuff
 | 
					        #region admin stuff
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -492,7 +492,6 @@ namespace OpenSim.Region.Environment.Scenes
 | 
				
			||||||
            m_scene = world;
 | 
					            m_scene = world;
 | 
				
			||||||
            m_uuid = client.AgentId;
 | 
					            m_uuid = client.AgentId;
 | 
				
			||||||
            m_regionInfo = reginfo;
 | 
					            m_regionInfo = reginfo;
 | 
				
			||||||
            m_localId = m_scene.NextLocalId;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
 | 
					            IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
 | 
				
			||||||
            if (gm != null)
 | 
					            if (gm != null)
 | 
				
			||||||
| 
						 | 
					@ -2214,8 +2213,6 @@ namespace OpenSim.Region.Environment.Scenes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    CrossAttachmentsIntoNewRegion(neighbourHandle, true);
 | 
					                    CrossAttachmentsIntoNewRegion(neighbourHandle, true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//                    m_scene.SendKillObject(m_localId);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    m_scene.NotifyMyCoarseLocationChange();
 | 
					                    m_scene.NotifyMyCoarseLocationChange();
 | 
				
			||||||
                    // the user may change their profile information in other region,
 | 
					                    // the user may change their profile information in other region,
 | 
				
			||||||
                    // so the userinfo in UserProfileCache is not reliable any more, delete it
 | 
					                    // so the userinfo in UserProfileCache is not reliable any more, delete it
 | 
				
			||||||
| 
						 | 
					@ -2265,7 +2262,6 @@ namespace OpenSim.Region.Environment.Scenes
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
 | 
					        public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            //
 | 
					 | 
				
			||||||
            if (!IsChildAgent)
 | 
					            if (!IsChildAgent)
 | 
				
			||||||
                return;
 | 
					                return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue