diff options
| author | Melanie | 2012-12-17 01:59:50 +0100 |
|---|---|---|
| committer | Melanie | 2012-12-17 01:59:50 +0100 |
| commit | a5781ea9fca2d35afa2f56cb468b827d4943c4c4 (patch) | |
| tree | 39580fcc0de85829e7d7ae71d861644c4d211268 /OpenSim/Services/Friends | |
| parent | Fix locking objects (diff) | |
| parent | * Fix for Prim Locking. Prior to the merge, it was just a clone of the root... (diff) | |
| download | opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.zip opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.tar.gz opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.tar.bz2 opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.tar.xz | |
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Services/Friends')
0 files changed, 0 insertions, 0 deletions