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

* minor: remove some mono compiler warnings, minor cleanup

Browse Source
This commit is contained in:
Justin Clarke Casey
2009-05-04 15:38:36 +00:00
parent f80ba373fa
commit 257fc5515a
11 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
View File

@@ -53,16 +53,15 @@ namespace OpenSim.Region.Framework.Scenes
public class RegionStatsHandler : IStreamedRequestHandler
{
{
private string osRXStatsURI = String.Empty;
private string osXStatsURI = String.Empty;
private string osSecret = String.Empty;
//private string osSecret = String.Empty;
private OpenSim.Framework.RegionInfo regionInfo;
public string localZone = TimeZone.CurrentTimeZone.StandardName;
public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info )
{
@@ -94,10 +93,9 @@ namespace OpenSim.Region.Framework.Scenes
}
private string Report()
{
{
OSDMap args = new OSDMap(30);
int time = Util.ToUnixTime( DateTime.Now );
//int time = Util.ToUnixTime( DateTime.Now );
args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
args["TimeZoneName"] = OSD.FromString(localZone);
args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours);

7
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -148,8 +148,6 @@ namespace OpenSim.Region.Framework.Scenes
protected float m_timespan = 0.089f;
protected DateTime m_lastupdate = DateTime.Now;
protected float m_timedilation = 1.0f;
private int m_update_physics = 1;
private int m_update_entitymovement = 1;
private int m_update_entities = 1; // Run through all objects checking for updates
@@ -230,11 +228,6 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_sceneGraph.m_syncRoot; }
}
public float TimeDilation
{
get { return m_timedilation; }
}
public int MaxPrimsPerFrame
{
get { return m_maxPrimsPerFrame; }

4
OpenSim/Region/Framework/Scenes/SceneBase.cs
View File

@@ -110,14 +110,14 @@ namespace OpenSim.Region.Framework.Scenes
public float TimeDilation
{
get { return 1.0f; }
get { return m_timedilation; }
}
protected float m_timedilation = 1.0f;
protected ulong m_regionHandle;
protected string m_regionName;
protected RegionInfo m_regInfo;
//public TerrainEngine Terrain;
public ITerrainChannel Heightmap;
/// <value>

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1361,7 +1361,7 @@ if (m_shape != null) {
/// <returns></returns>
public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed)
{
SceneObjectPart dupe = (SceneObjectPart) MemberwiseClone();
SceneObjectPart dupe = (SceneObjectPart)MemberwiseClone();
dupe.m_shape = m_shape.Copy();
dupe.m_regionHandle = m_regionHandle;
if (userExposed)