Merge branch 'master' into bullet-2.82
Robert Adams
commit
47ac103df7
|
|
@ -36,6 +36,7 @@ using Nini.Config;
|
|||
using Nwc.XmlRpc;
|
||||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Monitoring;
|
||||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Framework.Servers.HttpServer;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
|
|
@ -656,12 +657,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
|
|||
|
||||
public void Process()
|
||||
{
|
||||
httpThread = new Thread(SendRequest);
|
||||
httpThread.Name = "HttpRequestThread";
|
||||
httpThread.Priority = ThreadPriority.BelowNormal;
|
||||
httpThread.IsBackground = true;
|
||||
_finished = false;
|
||||
httpThread.Start();
|
||||
Watchdog.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -733,6 +730,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
|
|||
}
|
||||
|
||||
_finished = true;
|
||||
|
||||
Watchdog.RemoveThread();
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
|
|
|
|||
|
|
@ -224,6 +224,12 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
public bool m_clampPrimSize;
|
||||
public bool m_trustBinaries;
|
||||
public bool m_allowScriptCrossings = true;
|
||||
|
||||
/// <summary>
|
||||
/// Can avatars cross from and to this region?
|
||||
/// </summary>
|
||||
public bool AllowAvatarCrossing { get; set; }
|
||||
|
||||
public bool m_useFlySlow;
|
||||
public bool m_useTrashOnDelete = true;
|
||||
|
||||
|
|
@ -1023,6 +1029,12 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
#endregion Region Config
|
||||
|
||||
IConfig entityTransferConfig = m_config.Configs["EntityTransfer"];
|
||||
if (entityTransferConfig != null)
|
||||
{
|
||||
AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
|
||||
}
|
||||
|
||||
#region Interest Management
|
||||
|
||||
IConfig interestConfig = m_config.Configs["InterestManagement"];
|
||||
|
|
@ -1091,6 +1103,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
CollidablePrims = true;
|
||||
PhysicsEnabled = true;
|
||||
|
||||
AllowAvatarCrossing = true;
|
||||
|
||||
PeriodicBackup = true;
|
||||
UseBackup = true;
|
||||
|
||||
|
|
@ -5613,6 +5627,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
return true;
|
||||
}
|
||||
|
||||
if (!AllowAvatarCrossing && !viaTeleport)
|
||||
return false;
|
||||
|
||||
// FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check.
|
||||
// However, the long term fix is to make sure root agent count is always accurate.
|
||||
m_sceneGraph.RecalculateStats();
|
||||
|
|
|
|||
|
|
@ -608,8 +608,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Current velocity of the avatar.
|
||||
/// Velocity of the avatar with respect to its local reference frame.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// So when sat on a vehicle this will be 0. To get velocity with respect to the world use GetWorldVelocity()
|
||||
/// </remarks>
|
||||
public override Vector3 Velocity
|
||||
{
|
||||
get
|
||||
|
|
@ -622,10 +625,10 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
|
||||
// m_velocity, Name, Scene.RegionInfo.RegionName);
|
||||
}
|
||||
else if (ParentPart != null)
|
||||
{
|
||||
return ParentPart.ParentGroup.Velocity;
|
||||
}
|
||||
// else if (ParentPart != null)
|
||||
// {
|
||||
// return ParentPart.ParentGroup.Velocity;
|
||||
// }
|
||||
|
||||
return m_velocity;
|
||||
}
|
||||
|
|
@ -749,25 +752,32 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the world rotation of this presence.
|
||||
/// Get rotation relative to the world.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Unlike Rotation, this returns the world rotation no matter whether the avatar is sitting on a prim or not.
|
||||
/// </remarks>
|
||||
/// <returns></returns>
|
||||
public Quaternion GetWorldRotation()
|
||||
{
|
||||
if (IsSatOnObject)
|
||||
{
|
||||
SceneObjectPart sitPart = ParentPart;
|
||||
SceneObjectPart sitPart = ParentPart;
|
||||
|
||||
if (sitPart != null)
|
||||
return sitPart.GetWorldRotation() * Rotation;
|
||||
}
|
||||
if (sitPart != null)
|
||||
return sitPart.GetWorldRotation() * Rotation;
|
||||
|
||||
return Rotation;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get velocity relative to the world.
|
||||
/// </summary>
|
||||
public Vector3 GetWorldVelocity()
|
||||
{
|
||||
SceneObjectPart sitPart = ParentPart;
|
||||
|
||||
if (sitPart != null)
|
||||
return sitPart.ParentGroup.Velocity;
|
||||
|
||||
return Velocity;
|
||||
}
|
||||
|
||||
public void AdjustKnownSeeds()
|
||||
{
|
||||
Dictionary<ulong, string> seeds;
|
||||
|
|
@ -3216,7 +3226,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
m_lastVelocity = Velocity;
|
||||
}
|
||||
|
||||
CheckForBorderCrossing();
|
||||
if (Scene.AllowAvatarCrossing)
|
||||
CheckForBorderCrossing();
|
||||
|
||||
CheckForSignificantMovement(); // sends update to the modules.
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,10 +109,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
|||
|
||||
internal int m_resetk = 0;
|
||||
|
||||
// Working threads
|
||||
|
||||
private Thread m_listener = null;
|
||||
|
||||
private Object msyncConnect = new Object();
|
||||
|
||||
internal bool m_randomizeNick = true; // add random suffix
|
||||
|
|
@ -363,10 +359,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
|||
|
||||
m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port);
|
||||
|
||||
m_listener = new Thread(new ThreadStart(ListenerRun));
|
||||
m_listener.Name = "IRCConnectorListenerThread";
|
||||
m_listener.IsBackground = true;
|
||||
m_listener.Start();
|
||||
Watchdog.StartThread(ListenerRun, "IRCConnectionListenerThread", ThreadPriority.Normal, true, false);
|
||||
|
||||
// This is the message order recommended by RFC 2812
|
||||
if (m_password != null)
|
||||
|
|
@ -510,21 +503,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
|||
{
|
||||
while (m_enabled && m_connected)
|
||||
{
|
||||
|
||||
if ((inputLine = m_reader.ReadLine()) == null)
|
||||
throw new Exception("Listener input socket closed");
|
||||
|
||||
Watchdog.UpdateThread();
|
||||
|
||||
// m_log.Info("[IRCConnector]: " + inputLine);
|
||||
|
||||
if (inputLine.Contains("PRIVMSG"))
|
||||
{
|
||||
|
||||
Dictionary<string, string> data = ExtractMsg(inputLine);
|
||||
|
||||
// Any chat ???
|
||||
if (data != null)
|
||||
{
|
||||
|
||||
OSChatMessage c = new OSChatMessage();
|
||||
c.Message = data["msg"];
|
||||
c.Type = ChatTypeEnum.Region;
|
||||
|
|
@ -540,9 +532,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
|||
c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9));
|
||||
|
||||
ChannelState.OSChat(this, c, false);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -562,6 +552,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
|||
|
||||
if (m_enabled && (m_resetk == resetk))
|
||||
Reconnect();
|
||||
|
||||
Watchdog.RemoveThread();
|
||||
}
|
||||
|
||||
private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ using System.Runtime.InteropServices;
|
|||
using System.Text;
|
||||
using System.Threading;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Monitoring;
|
||||
using OpenSim.Region.Framework;
|
||||
using OpenSim.Region.CoreModules;
|
||||
using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging;
|
||||
|
|
@ -286,9 +287,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
|
|||
if (BSParam.UseSeparatePhysicsThread)
|
||||
{
|
||||
// The physics simulation should happen independently of the heartbeat loop
|
||||
m_physicsThread = new Thread(BulletSPluginPhysicsThread);
|
||||
m_physicsThread.Name = BulletEngineName;
|
||||
m_physicsThread.Start();
|
||||
m_physicsThread
|
||||
= Watchdog.StartThread(
|
||||
BulletSPluginPhysicsThread,
|
||||
string.Format("{0} ({1})", BulletEngineName, RegionName),
|
||||
ThreadPriority.Normal,
|
||||
true,
|
||||
true);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -856,7 +861,11 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
|
|||
// TODO.
|
||||
DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
|
||||
}
|
||||
|
||||
Watchdog.UpdateThread();
|
||||
}
|
||||
|
||||
Watchdog.RemoveThread();
|
||||
}
|
||||
|
||||
#endregion // Simulation
|
||||
|
|
|
|||
|
|
@ -2560,7 +2560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
if (m_host.ParentGroup.IsAttachment)
|
||||
{
|
||||
ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
|
||||
vel = avatar.Velocity;
|
||||
vel = avatar.GetWorldVelocity();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -11221,7 +11221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
ret.Add(new LSL_Rotation(av.GetWorldRotation()));
|
||||
break;
|
||||
case ScriptBaseClass.OBJECT_VELOCITY:
|
||||
ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z));
|
||||
ret.Add(new LSL_Vector(av.GetWorldVelocity()));
|
||||
break;
|
||||
case ScriptBaseClass.OBJECT_OWNER:
|
||||
ret.Add(new LSL_String(id));
|
||||
|
|
@ -11342,7 +11342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
ScenePresence sp = World.GetScenePresence(obj.ParentGroup.AttachedAvatar);
|
||||
|
||||
if (sp != null)
|
||||
vel = sp.Velocity;
|
||||
vel = sp.GetWorldVelocity();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -162,9 +162,6 @@ namespace OpenSim.Region.UserStatistics
|
|||
output.Append("OthrMS");
|
||||
HTMLUtil.TD_C(ref output);
|
||||
HTMLUtil.TD_O(ref output, TDHeaderClass);
|
||||
output.Append("ScrLPS");
|
||||
HTMLUtil.TD_C(ref output);
|
||||
HTMLUtil.TD_O(ref output, TDHeaderClass);
|
||||
output.Append("OutPPS");
|
||||
HTMLUtil.TD_C(ref output);
|
||||
HTMLUtil.TD_O(ref output, TDHeaderClass);
|
||||
|
|
@ -194,9 +191,6 @@ namespace OpenSim.Region.UserStatistics
|
|||
output.Append(sdata.OtherFrameTime);
|
||||
HTMLUtil.TD_C(ref output);
|
||||
HTMLUtil.TD_O(ref output, TDDataClassCenter);
|
||||
output.Append(sdata.ScriptLinesPerSecond);
|
||||
HTMLUtil.TD_C(ref output);
|
||||
HTMLUtil.TD_O(ref output, TDDataClassCenter);
|
||||
output.Append(sdata.OutPacketsPerSecond);
|
||||
HTMLUtil.TD_C(ref output);
|
||||
HTMLUtil.TD_O(ref output, TDDataClassCenter);
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ namespace OpenSim.Services.LLLoginService
|
|||
public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
|
||||
GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
|
||||
string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
|
||||
GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
|
||||
GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency,
|
||||
string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee)
|
||||
: this()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -77,8 +77,6 @@ namespace OpenSim.Services.LLLoginService
|
|||
protected string m_GatekeeperURL;
|
||||
protected bool m_AllowRemoteSetLoginLevel;
|
||||
protected string m_MapTileURL;
|
||||
protected string m_ProfileURL;
|
||||
protected string m_OpenIDURL;
|
||||
protected string m_SearchURL;
|
||||
protected string m_Currency;
|
||||
protected string m_ClassifiedFee;
|
||||
|
|
@ -119,8 +117,6 @@ namespace OpenSim.Services.LLLoginService
|
|||
m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
|
||||
new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty);
|
||||
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
|
||||
m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
|
||||
m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
|
||||
m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
|
||||
m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
|
||||
m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
|
||||
|
|
@ -498,7 +494,7 @@ namespace OpenSim.Services.LLLoginService
|
|||
= new LLLoginResponse(
|
||||
account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
|
||||
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
|
||||
m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
|
||||
m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone,
|
||||
m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);
|
||||
|
||||
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
|
||||
|
|
|
|||
|
|
@ -1,97 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>OpenSim._32BitLaunch</RootNamespace>
|
||||
<AssemblyName>OpenSim.32BitLaunch</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>..\..\..\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
|
||||
<Reference Include="OpenSim, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<ExecutableExtension>.exe</ExecutableExtension>
|
||||
<HintPath>..\..\..\bin\OpenSim.exe</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
|
|
@ -1,99 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Robust._32BitLaunch</RootNamespace>
|
||||
<AssemblyName>Robust.32BitLaunch</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>..\..\..\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\bin\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\bin\Robust.exe</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
|
|
@ -711,6 +711,9 @@
|
|||
;
|
||||
max_distance = 65535
|
||||
|
||||
; Allow avatars to cross into and out of the region.
|
||||
AllowAvatarCrossing = true
|
||||
|
||||
; Minimum user level required for HyperGrid teleports
|
||||
LevelHGTeleport = 0
|
||||
|
||||
|
|
|
|||
|
|
@ -372,16 +372,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
|
|||
; Url to search service
|
||||
; SearchURL = "http://127.0.0.1:8002/";
|
||||
|
||||
; For V2/3 Web Profiles
|
||||
; Work in progress: The ProfileServerURL/OpenIDServerURL are
|
||||
; being used in a development viewer as support for webprofiles
|
||||
; is being developed across the componets
|
||||
;
|
||||
; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
|
||||
;
|
||||
; For V2/V3 webapp authentication SSO
|
||||
; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
|
||||
|
||||
; For V3 destination guide
|
||||
; DestinationGuide = "http://127.0.0.1/guide"
|
||||
|
||||
|
|
|
|||
|
|
@ -331,16 +331,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
|
|||
; Url to search service
|
||||
; SearchURL = "http://127.0.0.1:8002/";
|
||||
|
||||
; For V2/3 Web Profiles
|
||||
; Work in progress: The ProfileServerURL/OpenIDServerURL are
|
||||
; being used in a development viewer as support for webprofiles
|
||||
; is being developed across the componets
|
||||
;
|
||||
; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
|
||||
;
|
||||
; For V2/V3 webapp authentication SSO
|
||||
; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
|
||||
|
||||
; For V3 destination guide
|
||||
; DestinationGuide = "http://127.0.0.1/guide"
|
||||
|
||||
|
|
|
|||
|
|
@ -1746,6 +1746,7 @@
|
|||
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
|
||||
<Reference name="Nini.dll" path="../../../../bin/"/>
|
||||
<Reference name="OpenSim.Framework"/>
|
||||
<Reference name="OpenSim.Framework.Monitoring"/>
|
||||
<Reference name="OpenSim.Region.Framework"/>
|
||||
<Reference name="OpenSim.Region.CoreModules"/>
|
||||
<Reference name="OpenSim.Region.OptionalModules"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
Many issues appear in the support channels because of a misunderstanding of the use of these utilities. And through discussion at OpenSimulator Office Hours it was determined that these tools probably serve no useful purpose anymore.
|
||||
|
||||
Instead of removing them immediately, we move them here, for a time, in case there is a useful purpose that has escaped us during conversations.
|
||||
|
||||
If a need to compile these arises, the OpenSim.32BitLaunch and Robust.32BitLaunch directories may be placed under the ./OpenSim/Tools sources subdirectory, run the prebuild script and compile.
|
||||
Loading…
Reference in New Issue