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

Merge remote-tracking branch 'upstream/master' into moses.metricsPhase2

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
This commit is contained in:
Glenn Martin
2015-05-01 14:11:16 -04:00
parent 625452b84b e7f2b77bfb
commit 72e17b0219
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1679,6 +1679,15 @@ namespace OpenSim.Region.Framework.Scenes
// Apply taints in terrain module to terrain in physics scene
if (Frame % m_update_terrain == 0)
{
// At several points inside the code there was a need to
// create a more precise measurement of time elapsed.
// This led to the addition of variables that have a
// similar function and thus remain tightly connected to
// their original counterparts. However, the original
// code is not receiving comments from our group because
// we don't feel right modifying the code to that degree
// at this point in time, the precise values all begin
// with the keyword precise
tmpMS = Util.EnvironmentTickCount();
simFrameStopwatch.Start();
UpdateTerrain();