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

Fix merge issues

avinationmerge
Melanie 2010-09-14 22:14:08 +01:00
parent 1212cb0c74
commit 2f41bc4ca7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1348,15 +1348,12 @@ namespace OpenSim.Region.Framework.Scenes
if (m_frame % m_update_presences == 0) if (m_frame % m_update_presences == 0)
m_sceneGraph.UpdatePresences(); m_sceneGraph.UpdatePresences();
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
// Update SceneObjectGroups that have scheduled themselves for updates // Update SceneObjectGroups that have scheduled themselves for updates
// Objects queue their updates onto all scene presences // Objects queue their updates onto all scene presences
if (m_frame % m_update_objects == 0) if (m_frame % m_update_objects == 0)
m_sceneGraph.UpdateObjectGroups(); m_sceneGraph.UpdateObjectGroups();
=======
// Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client) // Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client)
>>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
if (m_frame % m_update_coarse_locations == 0) if (m_frame % m_update_coarse_locations == 0)
{ {
List<Vector3> coarseLocations; List<Vector3> coarseLocations;

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -4330,8 +4330,8 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
} }
m_log.InfoFormat( m_log.InfoFormat(
"[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})", "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {3}",
p, itemID, assetID, asset); p, itemID, asset);
} }
catch (Exception e) catch (Exception e)
{ {