aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs9
3 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f437bc8..05af942 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -639,7 +639,7 @@ namespace OpenSim.Region.Framework.Scenes
639 m_sceneGridService = sceneGridService; 639 m_sceneGridService = sceneGridService;
640 m_SimulationDataService = simDataService; 640 m_SimulationDataService = simDataService;
641 m_EstateDataService = estateDataService; 641 m_EstateDataService = estateDataService;
642 m_regionHandle = m_regInfo.RegionHandle; 642 m_regionHandle = RegionInfo.RegionHandle;
643 m_lastIncoming = 0; 643 m_lastIncoming = 0;
644 m_lastOutgoing = 0; 644 m_lastOutgoing = 0;
645 645
@@ -4156,7 +4156,7 @@ namespace OpenSim.Region.Framework.Scenes
4156 // We have to wait until the viewer contacts this region after receiving EAC. 4156 // We have to wait until the viewer contacts this region after receiving EAC.
4157 // That calls AddNewClient, which finally creates the ScenePresence 4157 // That calls AddNewClient, which finally creates the ScenePresence
4158 int flags = GetUserFlags(cAgentData.AgentID); 4158 int flags = GetUserFlags(cAgentData.AgentID);
4159 if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags)) 4159 if (RegionInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags))
4160 { 4160 {
4161 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID); 4161 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID);
4162 return false; 4162 return false;
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index e8134cd..8db4397 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -113,7 +113,6 @@ namespace OpenSim.Region.Framework.Scenes
113 113
114 protected ulong m_regionHandle; 114 protected ulong m_regionHandle;
115 protected string m_regionName; 115 protected string m_regionName;
116 protected RegionInfo m_regInfo;
117 116
118 public ITerrainChannel Heightmap; 117 public ITerrainChannel Heightmap;
119 118
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 1c9a17e..e010864 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -355,6 +355,8 @@ namespace OpenSim.Region.Framework.Scenes
355 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); 355 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
356 if (null == asset) 356 if (null == asset)
357 { 357 {
358 string msg = String.Format("asset ID {0} could not be found", item.AssetID);
359 StoreScriptError(item.ItemID, msg);
358 m_log.ErrorFormat( 360 m_log.ErrorFormat(
359 "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", 361 "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
360 item.Name, item.ItemID, m_part.AbsolutePosition, 362 item.Name, item.ItemID, m_part.AbsolutePosition,
@@ -367,13 +369,6 @@ namespace OpenSim.Region.Framework.Scenes
367 if (m_part.ParentGroup.m_savedScriptState != null) 369 if (m_part.ParentGroup.m_savedScriptState != null)
368 item.OldItemID = RestoreSavedScriptState(item.LoadedItemID, item.OldItemID, item.ItemID); 370 item.OldItemID = RestoreSavedScriptState(item.LoadedItemID, item.OldItemID, item.ItemID);
369 371
370 string msg = String.Format("asset ID {0} could not be found", item.AssetID);
371 StoreScriptError(item.ItemID, msg);
372 m_log.ErrorFormat(
373 "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
374 item.Name, item.ItemID, m_part.AbsolutePosition,
375 m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID);
376
377 m_items.LockItemsForWrite(true); 372 m_items.LockItemsForWrite(true);
378 373
379 m_items[item.ItemID].OldItemID = item.OldItemID; 374 m_items[item.ItemID].OldItemID = item.OldItemID;