diff options
| author | Melanie | 2012-06-08 00:43:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-08 00:43:39 +0100 |
| commit | 48add77a4c985858794c2c3a9d7ea63a31921528 (patch) | |
| tree | 7757e425e3d9e93d742c51e3f39bee57be04546b /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Go back to calling IncomingCloseAgent() in the "kick user" command for consis... (diff) | |
| download | opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.zip opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.tar.gz opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.tar.bz2 opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.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