aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-23 22:07:48 +0000
committerTeravus Ovares2008-01-23 22:07:48 +0000
commit6874beff528042cbcc61c4ae330cfaf2ff1ceea0 (patch)
treed74bf18a4d062f95223b63773d834a3e6e227e11 /OpenSim
parentput the number in front of the migrations to make them easier to deal with (diff)
downloadopensim-SC_OLD-6874beff528042cbcc61c4ae330cfaf2ff1ceea0.zip
opensim-SC_OLD-6874beff528042cbcc61c4ae330cfaf2ff1ceea0.tar.gz
opensim-SC_OLD-6874beff528042cbcc61c4ae330cfaf2ff1ceea0.tar.bz2
opensim-SC_OLD-6874beff528042cbcc61c4ae330cfaf2ff1ceea0.tar.xz
* When Scene loads, added a platform string print out for testing purposes. Anyone on Debian want to run this revision and send me back the two platform lines? It would be helpful.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 6defe30..f7e5d62 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -280,6 +280,8 @@ namespace OpenSim.Region.Environment.Scenes
280 280
281 m_statsReporter = new SimStatsReporter(regInfo); 281 m_statsReporter = new SimStatsReporter(regInfo);
282 m_statsReporter.OnSendStatsResult += SendSimStatsPackets; 282 m_statsReporter.OnSendStatsResult += SendSimStatsPackets;
283 MainLog.Instance.Verbose("PLATFORM", System.Environment.OSVersion.Platform.ToString());
284 MainLog.Instance.Verbose("PLATFORM", System.Environment.OSVersion.ToString());
283 } 285 }
284 286
285 #endregion 287 #endregion
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index d13342b..dcff558 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Region.Physics.OdePlugin
138 { 138 {
139 if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z) 139 if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z)
140 { 140 {
141 if (((_size.X / 2f) > 0f) && ((_size.X / 2f) < 1000)) 141 if (((_size.X / 2f) > 0f))
142 { 142 {
143 prim_geom = d.CreateSphere(m_targetSpace, _size.X / 2); 143 prim_geom = d.CreateSphere(m_targetSpace, _size.X / 2);
144 } 144 }