aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorteravus2013-02-07 10:28:26 -0500
committerteravus2013-02-07 10:50:17 -0500
commit94a5232d3a07c3ff5f9b720dfc975848d750f423 (patch)
treef2329adf59b6525528db1e7e099e8beddaf39a6d /OpenSim/Region/Framework/Scenes/Scene.cs
parentThis is the final commit that enables the Websocket handler (diff)
parentRename "Bounciness" to "Restitution" (diff)
downloadopensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.zip
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.gz
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.bz2
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.xz
* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs16
1 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f8d84e3..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,19 +4479,6 @@ namespace OpenSim.Region.Framework.Scenes
4482 4479
4483 #region Script Engine 4480 #region Script Engine
4484 4481
4485 private List<ScriptEngineInterface> ScriptEngines = new List<ScriptEngineInterface>();
4486 public bool DumpAssetsToFile;
4487
4488 /// <summary>
4489 ///
4490 /// </summary>
4491 /// <param name="scriptEngine"></param>
4492 public void AddScriptEngine(ScriptEngineInterface scriptEngine)
4493 {
4494 ScriptEngines.Add(scriptEngine);
4495 scriptEngine.InitializeEngine(this);
4496 }
4497
4498 private bool ScriptDanger(SceneObjectPart part,Vector3 pos) 4482 private bool ScriptDanger(SceneObjectPart part,Vector3 pos)
4499 { 4483 {
4500 ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y); 4484 ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);