aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-07 21:33:11 +0000
committerJustin Clarke Casey2008-11-07 21:33:11 +0000
commit47e3d4d1f08b2aec45a57b985a2608defe07ca19 (patch)
treed70b60f388675a1b95af34cc4d77075f256e77f4
parent* minor: Just some tidy up of log messages, etc. (diff)
downloadopensim-SC_OLD-47e3d4d1f08b2aec45a57b985a2608defe07ca19.zip
opensim-SC_OLD-47e3d4d1f08b2aec45a57b985a2608defe07ca19.tar.gz
opensim-SC_OLD-47e3d4d1f08b2aec45a57b985a2608defe07ca19.tar.bz2
opensim-SC_OLD-47e3d4d1f08b2aec45a57b985a2608defe07ca19.tar.xz
* Remove next local id from SceneBase
* This was only reference by ScenePresence and not used anyway - Scene itself had it's own copy
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IScene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
3 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index b6043ac..0ba3e7f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -45,7 +45,6 @@ namespace OpenSim.Framework
45 public interface IScene 45 public interface IScene
46 { 46 {
47 RegionInfo RegionInfo { get; } 47 RegionInfo RegionInfo { get; }
48 uint NextLocalId { get; }
49 RegionStatus Region_Status { get; set; } 48 RegionStatus Region_Status { get; set; }
50 49
51 ClientManager ClientManager { get; } 50 ClientManager ClientManager { get; }
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
71 get { return m_eventManager; } 71 get { return m_eventManager; }
72 } 72 }
73 73
74
75 protected SceneExternalChecks m_externalChecks; 74 protected SceneExternalChecks m_externalChecks;
76 public SceneExternalChecks ExternalChecks 75 public SceneExternalChecks ExternalChecks
77 { 76 {
@@ -80,8 +79,6 @@ namespace OpenSim.Region.Environment.Scenes
80 79
81 protected string m_datastore; 80 protected string m_datastore;
82 81
83 private uint m_nextLocalId = 8880000;
84
85 private AssetCache m_assetCache; 82 private AssetCache m_assetCache;
86 83
87 public AssetCache AssetCache 84 public AssetCache AssetCache
@@ -155,11 +152,6 @@ namespace OpenSim.Region.Environment.Scenes
155 get { return m_regInfo; } 152 get { return m_regInfo; }
156 } 153 }
157 154
158 public uint NextLocalId
159 {
160 get { return m_nextLocalId++; }
161 }
162
163 #region admin stuff 155 #region admin stuff
164 156
165 /// <summary> 157 /// <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
492 m_scene = world; 492 m_scene = world;
493 m_uuid = client.AgentId; 493 m_uuid = client.AgentId;
494 m_regionInfo = reginfo; 494 m_regionInfo = reginfo;
495 m_localId = m_scene.NextLocalId;
496 495
497 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 496 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
498 if (gm != null) 497 if (gm != null)
@@ -2214,8 +2213,6 @@ namespace OpenSim.Region.Environment.Scenes
2214 2213
2215 CrossAttachmentsIntoNewRegion(neighbourHandle, true); 2214 CrossAttachmentsIntoNewRegion(neighbourHandle, true);
2216 2215
2217// m_scene.SendKillObject(m_localId);
2218
2219 m_scene.NotifyMyCoarseLocationChange(); 2216 m_scene.NotifyMyCoarseLocationChange();
2220 // the user may change their profile information in other region, 2217 // the user may change their profile information in other region,
2221 // so the userinfo in UserProfileCache is not reliable any more, delete it 2218 // so the userinfo in UserProfileCache is not reliable any more, delete it
@@ -2265,7 +2262,6 @@ namespace OpenSim.Region.Environment.Scenes
2265 /// </summary> 2262 /// </summary>
2266 public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) 2263 public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
2267 { 2264 {
2268 //
2269 if (!IsChildAgent) 2265 if (!IsChildAgent)
2270 return; 2266 return;
2271 2267