aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-04 15:38:36 +0000
committerJustin Clarke Casey2009-05-04 15:38:36 +0000
commit257fc5515ac9cb36032c2f44f040c3620ed2f328 (patch)
tree167d99d28167e6ab36a96bccf22fbef0b9f0cce1 /OpenSim/Region/Framework/Scenes
parentPrebuild changes to allow the console to reference the http server (diff)
downloadopensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.zip
opensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.gz
opensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.bz2
opensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.xz
* minor: remove some mono compiler warnings, minor cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
4 files changed, 8 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index f521490..4ef5221 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -53,16 +53,15 @@ namespace OpenSim.Region.Framework.Scenes
53 53
54 54
55 public class RegionStatsHandler : IStreamedRequestHandler 55 public class RegionStatsHandler : IStreamedRequestHandler
56 { 56 {
57
58 private string osRXStatsURI = String.Empty; 57 private string osRXStatsURI = String.Empty;
59 private string osXStatsURI = String.Empty; 58 private string osXStatsURI = String.Empty;
60 private string osSecret = String.Empty; 59 //private string osSecret = String.Empty;
61 private OpenSim.Framework.RegionInfo regionInfo; 60 private OpenSim.Framework.RegionInfo regionInfo;
62 public string localZone = TimeZone.CurrentTimeZone.StandardName; 61 public string localZone = TimeZone.CurrentTimeZone.StandardName;
63 public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now); 62 public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
64 63
65 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 64 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
66 65
67 public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info ) 66 public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info )
68 { 67 {
@@ -94,10 +93,9 @@ namespace OpenSim.Region.Framework.Scenes
94 } 93 }
95 94
96 private string Report() 95 private string Report()
97 { 96 {
98
99 OSDMap args = new OSDMap(30); 97 OSDMap args = new OSDMap(30);
100 int time = Util.ToUnixTime( DateTime.Now ); 98 //int time = Util.ToUnixTime( DateTime.Now );
101 args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); 99 args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
102 args["TimeZoneName"] = OSD.FromString(localZone); 100 args["TimeZoneName"] = OSD.FromString(localZone);
103 args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); 101 args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9f99305..4dc1661 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -148,8 +148,6 @@ namespace OpenSim.Region.Framework.Scenes
148 protected float m_timespan = 0.089f; 148 protected float m_timespan = 0.089f;
149 protected DateTime m_lastupdate = DateTime.Now; 149 protected DateTime m_lastupdate = DateTime.Now;
150 150
151 protected float m_timedilation = 1.0f;
152
153 private int m_update_physics = 1; 151 private int m_update_physics = 1;
154 private int m_update_entitymovement = 1; 152 private int m_update_entitymovement = 1;
155 private int m_update_entities = 1; // Run through all objects checking for updates 153 private int m_update_entities = 1; // Run through all objects checking for updates
@@ -230,11 +228,6 @@ namespace OpenSim.Region.Framework.Scenes
230 get { return m_sceneGraph.m_syncRoot; } 228 get { return m_sceneGraph.m_syncRoot; }
231 } 229 }
232 230
233 public float TimeDilation
234 {
235 get { return m_timedilation; }
236 }
237
238 public int MaxPrimsPerFrame 231 public int MaxPrimsPerFrame
239 { 232 {
240 get { return m_maxPrimsPerFrame; } 233 get { return m_maxPrimsPerFrame; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 9d8582f..6510a0c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -110,14 +110,14 @@ namespace OpenSim.Region.Framework.Scenes
110 110
111 public float TimeDilation 111 public float TimeDilation
112 { 112 {
113 get { return 1.0f; } 113 get { return m_timedilation; }
114 } 114 }
115 protected float m_timedilation = 1.0f;
115 116
116 protected ulong m_regionHandle; 117 protected ulong m_regionHandle;
117 protected string m_regionName; 118 protected string m_regionName;
118 protected RegionInfo m_regInfo; 119 protected RegionInfo m_regInfo;
119 120
120 //public TerrainEngine Terrain;
121 public ITerrainChannel Heightmap; 121 public ITerrainChannel Heightmap;
122 122
123 /// <value> 123 /// <value>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index bca1a65..6b5883e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1361,7 +1361,7 @@ if (m_shape != null) {
1361 /// <returns></returns> 1361 /// <returns></returns>
1362 public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed) 1362 public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed)
1363 { 1363 {
1364 SceneObjectPart dupe = (SceneObjectPart) MemberwiseClone(); 1364 SceneObjectPart dupe = (SceneObjectPart)MemberwiseClone();
1365 dupe.m_shape = m_shape.Copy(); 1365 dupe.m_shape = m_shape.Copy();
1366 dupe.m_regionHandle = m_regionHandle; 1366 dupe.m_regionHandle = m_regionHandle;
1367 if (userExposed) 1367 if (userExposed)