diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f5c06df..3c8e199 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -714,7 +714,7 @@ namespace OpenSim | |||
714 | 714 | ||
715 | return new Scene( | 715 | return new Scene( |
716 | regionInfo, circuitManager, sceneGridService, | 716 | regionInfo, circuitManager, sceneGridService, |
717 | simDataService, estateDataService, false, | 717 | simDataService, estateDataService, |
718 | Config, m_version); | 718 | Config, m_version); |
719 | } | 719 | } |
720 | 720 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 482235c..de3978c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -720,7 +720,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
720 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, | 720 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, |
721 | SceneCommunicationService sceneGridService, | 721 | SceneCommunicationService sceneGridService, |
722 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 722 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
723 | bool dumpAssetsToFile, | ||
724 | IConfigSource config, string simulatorVersion) | 723 | IConfigSource config, string simulatorVersion) |
725 | : this(regInfo) | 724 | : this(regInfo) |
726 | { | 725 | { |
@@ -811,8 +810,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
811 | 810 | ||
812 | RegisterDefaultSceneEvents(); | 811 | RegisterDefaultSceneEvents(); |
813 | 812 | ||
814 | DumpAssetsToFile = dumpAssetsToFile; | ||
815 | |||
816 | // XXX: Don't set the public property since we don't want to activate here. This needs to be handled | 813 | // XXX: Don't set the public property since we don't want to activate here. This needs to be handled |
817 | // better in the future. | 814 | // better in the future. |
818 | m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts; | 815 | m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts; |
@@ -4482,8 +4479,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4482 | 4479 | ||
4483 | #region Script Engine | 4480 | #region Script Engine |
4484 | 4481 | ||
4485 | public bool DumpAssetsToFile; | ||
4486 | |||
4487 | private bool ScriptDanger(SceneObjectPart part,Vector3 pos) | 4482 | private bool ScriptDanger(SceneObjectPart part,Vector3 pos) |
4488 | { | 4483 | { |
4489 | ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y); | 4484 | ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y); |