Merge branch 'master' into careminster
commit
d8c27de395
|
@ -798,7 +798,7 @@ namespace OpenSim
|
||||||
|
|
||||||
return new Scene(
|
return new Scene(
|
||||||
regionInfo, circuitManager, sceneGridService,
|
regionInfo, circuitManager, sceneGridService,
|
||||||
simDataService, estateDataService, false,
|
simDataService, estateDataService,
|
||||||
Config, m_version);
|
Config, m_version);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -740,7 +740,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
public Scene(RegionInfo regInfo, AgentCircuitManager authen,
|
public Scene(RegionInfo regInfo, AgentCircuitManager authen,
|
||||||
SceneCommunicationService sceneGridService,
|
SceneCommunicationService sceneGridService,
|
||||||
ISimulationDataService simDataService, IEstateDataService estateDataService,
|
ISimulationDataService simDataService, IEstateDataService estateDataService,
|
||||||
bool dumpAssetsToFile,
|
|
||||||
IConfigSource config, string simulatorVersion)
|
IConfigSource config, string simulatorVersion)
|
||||||
: this(regInfo)
|
: this(regInfo)
|
||||||
{
|
{
|
||||||
|
@ -833,8 +832,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
RegisterDefaultSceneEvents();
|
RegisterDefaultSceneEvents();
|
||||||
|
|
||||||
DumpAssetsToFile = dumpAssetsToFile;
|
|
||||||
|
|
||||||
// XXX: Don't set the public property since we don't want to activate here. This needs to be handled
|
// XXX: Don't set the public property since we don't want to activate here. This needs to be handled
|
||||||
// better in the future.
|
// better in the future.
|
||||||
m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts;
|
m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts;
|
||||||
|
@ -4687,8 +4684,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
#region Script Engine
|
#region Script Engine
|
||||||
|
|
||||||
public bool DumpAssetsToFile;
|
|
||||||
|
|
||||||
private bool ScriptDanger(SceneObjectPart part,Vector3 pos)
|
private bool ScriptDanger(SceneObjectPart part,Vector3 pos)
|
||||||
{
|
{
|
||||||
ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);
|
ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);
|
||||||
|
|
|
@ -117,7 +117,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
#endregion Enumerations
|
#endregion Enumerations
|
||||||
|
|
||||||
public class SceneObjectPart : IScriptHost, ISceneEntity
|
public class SceneObjectPart : ISceneEntity
|
||||||
{
|
{
|
||||||
/// <value>
|
/// <value>
|
||||||
/// Denote all sides of the prim
|
/// Denote all sides of the prim
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using OpenMetaverse;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.Framework.Scenes.Scripting
|
|
||||||
{
|
|
||||||
public interface IScriptHost
|
|
||||||
{
|
|
||||||
string Name { get; set; }
|
|
||||||
string Description { get; set; }
|
|
||||||
|
|
||||||
UUID UUID { get; }
|
|
||||||
UUID OwnerID { get; }
|
|
||||||
UUID CreatorID { get; }
|
|
||||||
Vector3 AbsolutePosition { get; }
|
|
||||||
|
|
||||||
string SitName { get; set; }
|
|
||||||
string TouchName { get; set; }
|
|
||||||
void SetText(string text, Vector3 color, double alpha);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,91 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using OpenMetaverse;
|
|
||||||
using log4net;
|
|
||||||
using System.Reflection;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.Framework.Scenes.Scripting
|
|
||||||
{
|
|
||||||
public class NullScriptHost : IScriptHost
|
|
||||||
{
|
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
|
||||||
|
|
||||||
private Vector3 m_pos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
|
|
||||||
|
|
||||||
public string Name
|
|
||||||
{
|
|
||||||
get { return "Object"; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public string SitName
|
|
||||||
{
|
|
||||||
get { return String.Empty; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public string TouchName
|
|
||||||
{
|
|
||||||
get { return String.Empty; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Description
|
|
||||||
{
|
|
||||||
get { return String.Empty; }
|
|
||||||
set { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public UUID UUID
|
|
||||||
{
|
|
||||||
get { return UUID.Zero; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public UUID OwnerID
|
|
||||||
{
|
|
||||||
get { return UUID.Zero; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public UUID CreatorID
|
|
||||||
{
|
|
||||||
get { return UUID.Zero; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public Vector3 AbsolutePosition
|
|
||||||
{
|
|
||||||
get { return m_pos; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetText(string text, Vector3 color, double alpha)
|
|
||||||
{
|
|
||||||
m_log.Warn("Tried to SetText "+text+" on NullScriptHost");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -139,7 +139,7 @@ namespace OpenSim.Tests.Common
|
||||||
SceneCommunicationService scs = new SceneCommunicationService();
|
SceneCommunicationService scs = new SceneCommunicationService();
|
||||||
|
|
||||||
TestScene testScene = new TestScene(
|
TestScene testScene = new TestScene(
|
||||||
regInfo, m_acm, scs, m_simDataService, m_estateDataService, false, configSource, null);
|
regInfo, m_acm, scs, m_simDataService, m_estateDataService, configSource, null);
|
||||||
|
|
||||||
INonSharedRegionModule godsModule = new GodsModule();
|
INonSharedRegionModule godsModule = new GodsModule();
|
||||||
godsModule.Initialise(new IniConfigSource());
|
godsModule.Initialise(new IniConfigSource());
|
||||||
|
|
|
@ -41,10 +41,9 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
public TestScene(
|
public TestScene(
|
||||||
RegionInfo regInfo, AgentCircuitManager authen,
|
RegionInfo regInfo, AgentCircuitManager authen,
|
||||||
SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
|
SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
|
||||||
bool dumpAssetsToFile,
|
|
||||||
IConfigSource config, string simulatorVersion)
|
IConfigSource config, string simulatorVersion)
|
||||||
: base(regInfo, authen, sceneGridService, simDataService, estateDataService,
|
: base(regInfo, authen, sceneGridService, simDataService, estateDataService,
|
||||||
dumpAssetsToFile, config, simulatorVersion)
|
config, simulatorVersion)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,4 +45,8 @@ ExternalHostName = "SYSTEMIP"
|
||||||
; *
|
; *
|
||||||
|
|
||||||
; RegionType = "Mainland"
|
; RegionType = "Mainland"
|
||||||
|
|
||||||
|
; *
|
||||||
|
; * UUID of texture to use as a maptile for this region.
|
||||||
|
; * Only set if you have disabled dynamic generation of the map tile from the region contents.
|
||||||
; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
|
; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
|
||||||
|
|
Loading…
Reference in New Issue