diff options
| author | Melanie | 2011-12-12 11:42:22 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-12 11:42:22 +0000 |
| commit | 52a4dbccbec7f3c3139f49c29fdc20b8332f50f0 (patch) | |
| tree | c1c76545b90c9a9df67886eb01d10e8388785c00 /.gitignore | |
| parent | Fix a regression that causes data from the attachments module to fail loading (diff) | |
| parent | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsCo... (diff) | |
| download | opensim-SC-52a4dbccbec7f3c3139f49c29fdc20b8332f50f0.zip opensim-SC-52a4dbccbec7f3c3139f49c29fdc20b8332f50f0.tar.gz opensim-SC-52a4dbccbec7f3c3139f49c29fdc20b8332f50f0.tar.bz2 opensim-SC-52a4dbccbec7f3c3139f49c29fdc20b8332f50f0.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions