diff options
| author | Melanie | 2012-05-31 03:37:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-31 03:37:43 +0100 |
| commit | e696d1d95225e3ddf90c823a2309dd8760af935b (patch) | |
| tree | 8a72f0f86f2e6fd6e2e5d779993699b66f2c8ef9 /OpenSim/Services/LLLoginService | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | ubitode prim: if makebody() is called already having a body, do a full destru... (diff) | |
| download | opensim-SC_OLD-e696d1d95225e3ddf90c823a2309dd8760af935b.zip opensim-SC_OLD-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.gz opensim-SC_OLD-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.bz2 opensim-SC_OLD-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Services/LLLoginService')
0 files changed, 0 insertions, 0 deletions