diff options
| author | Melanie | 2012-10-28 18:43:28 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-28 18:43:28 +0000 |
| commit | 502efdb894dce21e6b5ad7b45222765af6510d92 (patch) | |
| tree | 0d4ad5ec40a862c301538196fe89fbf8883dc04e /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Deep copy the collection of at_target objects so it can't be modified while (diff) | |
| download | opensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.zip opensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.tar.gz opensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.tar.bz2 opensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
0 files changed, 0 insertions, 0 deletions