diff options
author | Melanie | 2012-03-20 23:39:02 +0000 |
---|---|---|
committer | Melanie | 2012-03-20 23:39:02 +0000 |
commit | 35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch) | |
tree | e245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add prim name to "[MESH]: No recognized physics mesh..." log message (diff) | |
download | opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2 opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
0 files changed, 0 insertions, 0 deletions