Fix prim locking to behave like SL
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim