mirror of
https://github.com/opensim/opensim.git
synced 2026-06-03 17:16:31 +08:00
Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs