diff options
| author | UbitUmarov | 2012-05-28 13:13:01 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-05-28 13:13:01 +0100 |
| commit | 5141f4075f0f28f24d9528ae8770b8ede56e319f (patch) | |
| tree | 40c049175c660ea39c355078a45d96e6eca16453 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | disable collision sounds for now (diff) | |
| parent | Place the return back into collision sounds. (diff) | |
| download | opensim-SC-5141f4075f0f28f24d9528ae8770b8ede56e319f.zip opensim-SC-5141f4075f0f28f24d9528ae8770b8ede56e319f.tar.gz opensim-SC-5141f4075f0f28f24d9528ae8770b8ede56e319f.tar.bz2 opensim-SC-5141f4075f0f28f24d9528ae8770b8ede56e319f.tar.xz | |
Merge branch 'avination' into ubitwork
Conflicts:
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
0 files changed, 0 insertions, 0 deletions