aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
2 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index abec699..12c7fea 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1348,15 +1348,12 @@ namespace OpenSim.Region.Framework.Scenes
1348 if (m_frame % m_update_presences == 0) 1348 if (m_frame % m_update_presences == 0)
1349 m_sceneGraph.UpdatePresences(); 1349 m_sceneGraph.UpdatePresences();
1350 1350
1351<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
1352 // Update SceneObjectGroups that have scheduled themselves for updates 1351 // Update SceneObjectGroups that have scheduled themselves for updates
1353 // Objects queue their updates onto all scene presences 1352 // Objects queue their updates onto all scene presences
1354 if (m_frame % m_update_objects == 0) 1353 if (m_frame % m_update_objects == 0)
1355 m_sceneGraph.UpdateObjectGroups(); 1354 m_sceneGraph.UpdateObjectGroups();
1356 1355
1357=======
1358 // Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client) 1356 // Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client)
1359>>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
1360 if (m_frame % m_update_coarse_locations == 0) 1357 if (m_frame % m_update_coarse_locations == 0)
1361 { 1358 {
1362 List<Vector3> coarseLocations; 1359 List<Vector3> coarseLocations;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index caf376b..ed92d86 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4330,8 +4330,8 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
4330 } 4330 }
4331 4331
4332 m_log.InfoFormat( 4332 m_log.InfoFormat(
4333 "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})", 4333 "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {3}",
4334 p, itemID, assetID, asset); 4334 p, itemID, asset);
4335 } 4335 }
4336 catch (Exception e) 4336 catch (Exception e)
4337 { 4337 {