OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-06-25 14:30:28 +00:00
parent c4641d7005
commit a2b1a1787d
15 changed files with 149 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -91,7 +91,9 @@ namespace OpenSim.Data.NHibernate
{ {
user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
} }
catch (Exception) {} catch (Exception)
{
}
return (user != null); return (user != null);
} }
@ -161,10 +163,13 @@ namespace OpenSim.Data.NHibernate
{ {
UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData; UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData;
if (old == null) { if (old == null)
{
session.Save(agent); session.Save(agent);
session.Transaction.Commit(); session.Transaction.Commit();
} else { }
else
{
UpdateUserAgent(agent); UpdateUserAgent(agent);
} }
} }

3
OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
View File

@ -470,7 +470,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
} }
} }
/// <summary> /// <summary>
/// Checks to see height deltas in the tainted terrain patch at xStart ,yStart /// Checks to see height deltas in the tainted terrain patch at xStart ,yStart
/// are all within the current estate limits /// are all within the current estate limits
@ -509,7 +508,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
return changesLimited; return changesLimited;
} }
/// <summary> /// <summary>
/// Sends a copy of the current terrain to the scenes clients /// Sends a copy of the current terrain to the scenes clients
/// </summary> /// </summary>
@ -589,7 +587,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
} }
} }
#region Console Commands #region Console Commands
private void InterfaceLoadFile(Object[] args) private void InterfaceLoadFile(Object[] args)

3
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -1803,8 +1803,11 @@ namespace OpenSim.Region.Physics.Meshing
int vCount = 0; int vCount = 0;
foreach (Vertex v in result.vertices) foreach (Vertex v in result.vertices)
{
if (v != null) if (v != null)
vCount++; vCount++;
}
System.Console.WriteLine("Mesh vertex count: " + vCount.ToString()); System.Console.WriteLine("Mesh vertex count: " + vCount.ToString());
#endif #endif

7
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -1773,15 +1773,16 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
// Finished with all sim stepping. If requested, dump world state to file for debugging. // Finished with all sim stepping. If requested, dump world state to file for debugging.
// TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed? // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed?
// TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots? // TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots?
if(physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0) ) { if (physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0))
{
string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename
string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file
if(physics_logging_append_existing_logfile) { if (physics_logging_append_existing_logfile)
{
string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------"; string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------";
TextWriter fwriter = File.AppendText(fname); TextWriter fwriter = File.AppendText(fname);
fwriter.WriteLine(header); fwriter.WriteLine(header);