ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
parent 9d28fd41c6 b16abc8166
commit 254b26a7d5
960 changed files with 23754 additions and 23741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -85,7 +85,7 @@ namespace OpenSim
protected string proxyUrl;
protected int proxyOffset = 0;
public string userStatsURI = String.Empty;
public string managedStatsURI = String.Empty;
@@ -125,7 +125,7 @@ namespace OpenSim
{
get { return m_EnvConfigSource; }
}
public uint HttpServerPort
{
get { return m_httpServerPort; }
@@ -210,7 +210,7 @@ namespace OpenSim
}
/// <summary>
/// Performs startup specific to the region server, including initialization of the scene
/// Performs startup specific to the region server, including initialization of the scene
/// such as loading configuration from disk.
/// </summary>
protected override void StartupSpecific()
@@ -228,7 +228,7 @@ namespace OpenSim
string pidFile = startupConfig.GetString("PIDFile", String.Empty);
if (pidFile != String.Empty)
CreatePIDFile(pidFile);
userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
@@ -254,11 +254,11 @@ namespace OpenSim
if (m_simulationDataService == null)
throw new Exception(
string.Format(
"Could not load an ISimulationDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [SimulationDataStore] config section.",
"Could not load an ISimulationDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [SimulationDataStore] config section.",
module));
// Load the estate data service
module = Util.GetConfigVarFromSections<string>(Config, "LocalServiceModule", new string[]{"EstateDataStore", "EstateService"}, String.Empty);
module = Util.GetConfigVarFromSections<string>(Config, "LocalServiceModule", new string[]{"EstateDataStore", "EstateService"}, String.Empty);
if (String.IsNullOrEmpty(module))
throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] or [EstateService] section");
@@ -268,7 +268,7 @@ namespace OpenSim
if (m_estateDataService == null)
throw new Exception(
string.Format(
"Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.",
"Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.",
module));
}
@@ -427,9 +427,9 @@ namespace OpenSim
regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName +
":" + regionInfo.HttpPort.ToString() + "/";
regionInfo.osSecret = m_osSecret;
if ((proxyUrl.Length > 0) && (portadd_flag))
{
// set proxy url to RegionInfo
@@ -483,17 +483,17 @@ namespace OpenSim
// Prims have to be loaded after module configuration since some modules may be invoked during the load
scene.LoadPrimsFromStorage(regionInfo.originRegionID);
// TODO : Try setting resource for region xstats here on scene
MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
scene.EventManager.TriggerParcelPrimCountUpdate();
if (scene.SnmpService != null)
{
scene.SnmpService.BootInfo("Grid Registration in progress", scene);
}
}
try
{
@@ -502,7 +502,7 @@ namespace OpenSim
catch (Exception e)
{
m_log.ErrorFormat(
"[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
"[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
e.Message, e.StackTrace);
if (scene.SnmpService != null)
@@ -630,7 +630,7 @@ namespace OpenSim
if (rawEstateOwnerUuid == null)
rawEstateOwnerUuid = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
UUID estateOwnerUuid = UUID.Zero;
if (!UUID.TryParse(rawEstateOwnerUuid, out estateOwnerUuid))
{
@@ -693,7 +693,7 @@ namespace OpenSim
scene.DeleteAllSceneObjects();
SceneManager.CloseScene(scene);
//ShutdownClientServer(scene.RegionInfo);
if (!cleanup)
return;
@@ -755,7 +755,7 @@ namespace OpenSim
SceneManager.CloseScene(scene);
//ShutdownClientServer(scene.RegionInfo);
}
/// <summary>
/// Remove a region from the simulator without deleting it permanently.
/// </summary>
@@ -767,7 +767,7 @@ namespace OpenSim
if (SceneManager.TryGetScene(name, out target))
CloseRegion(target);
}
/// <summary>
/// Create a scene and its initial base structures.
/// </summary>
@@ -803,15 +803,15 @@ namespace OpenSim
IEstateDataService estateDataService, AgentCircuitManager circuitManager)
{
return new Scene(
regionInfo, circuitManager,
regionInfo, circuitManager,
simDataService, estateDataService,
Config, m_version);
}
protected virtual void HandleRestartRegion(RegionInfo whichRegion)
{
m_log.InfoFormat(
"[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})",
"[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})",
whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY);
//ShutdownClientServer(whichRegion);
@@ -846,18 +846,18 @@ namespace OpenSim
/// <summary>
/// Handler to supply the current extended status of this sim
/// Sends the statistical data in a json serialization
/// Sends the statistical data in a json serialization
/// </summary>
public class XSimStatusHandler : BaseStreamHandler
{
OpenSimBase m_opensim;
public XSimStatusHandler(OpenSimBase sim)
public XSimStatusHandler(OpenSimBase sim)
: base("GET", "/" + Util.SHA1Hash(sim.osSecret), "XSimStatus", "Simulator XStatus")
{
m_opensim = sim;
}
protected override byte[] ProcessRequest(string path, Stream request,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
@@ -872,20 +872,20 @@ namespace OpenSim
/// <summary>
/// Handler to supply the current extended status of this sim to a user configured URI
/// Sends the statistical data in a json serialization
/// If the request contains a key, "callback" the response will be wrappend in the
/// Sends the statistical data in a json serialization
/// If the request contains a key, "callback" the response will be wrappend in the
/// associated value for jsonp used with ajax/javascript
/// </summary>
protected class UXSimStatusHandler : BaseStreamHandler
{
OpenSimBase m_opensim;
public UXSimStatusHandler(OpenSimBase sim)
: base("GET", "/" + sim.userStatsURI, "UXSimStatus", "Simulator UXStatus")
{
m_opensim = sim;
m_opensim = sim;
}
protected override byte[] ProcessRequest(string path, Stream request,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
@@ -978,7 +978,7 @@ namespace OpenSim
{
regionnum = SceneManager.Scenes.Count;
}
/// <summary>
/// Create an estate with an initial region.
/// </summary>
@@ -1005,19 +1005,19 @@ namespace OpenSim
MainConsole.Instance.OutputFormat("An estate named {0} already exists. Please try again.", newName);
return false;
}
regInfo.EstateSettings.EstateName = newName;
// FIXME: Later on, the scene constructor will reload the estate settings no matter what.
// Therefore, we need to do an initial save here otherwise the new estate name will be reset
// back to the default. The reloading of estate settings by scene could be eliminated if it
// knows that the passed in settings in RegionInfo are already valid. Also, it might be
// knows that the passed in settings in RegionInfo are already valid. Also, it might be
// possible to eliminate some additional later saves made by callers of this method.
EstateDataService.StoreEstateSettings(regInfo.EstateSettings);
EstateDataService.StoreEstateSettings(regInfo.EstateSettings);
return true;
}
/// <summary>
/// Load the estate information for the provided RegionInfo object.
/// </summary>
@@ -1031,8 +1031,8 @@ namespace OpenSim
return false; // estate info in the database did not change
m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
Dictionary<string, EstateSettings> estatesByName = new Dictionary<string, EstateSettings>();
foreach (EstateSettings estate in estates)
@@ -1130,7 +1130,7 @@ namespace OpenSim
return true; // need to update the database
}
}
public class OpenSimConfigSource
{
public IConfigSource Source;