aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorUbitUmarov2012-05-28 13:13:01 +0100
committerUbitUmarov2012-05-28 13:13:01 +0100
commit5141f4075f0f28f24d9528ae8770b8ede56e319f (patch)
tree40c049175c660ea39c355078a45d96e6eca16453 /OpenSim/Data
parent disable collision sounds for now (diff)
parentPlace the return back into collision sounds. (diff)
downloadopensim-SC_OLD-5141f4075f0f28f24d9528ae8770b8ede56e319f.zip
opensim-SC_OLD-5141f4075f0f28f24d9528ae8770b8ede56e319f.tar.gz
opensim-SC_OLD-5141f4075f0f28f24d9528ae8770b8ede56e319f.tar.bz2
opensim-SC_OLD-5141f4075f0f28f24d9528ae8770b8ede56e319f.tar.xz
Merge branch 'avination' into ubitwork
Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs
Diffstat (limited to 'OpenSim/Data')
0 files changed, 0 insertions, 0 deletions