opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2012-02-10 10:20:51 +0000
committer	Melanie	2012-02-10 10:20:51 +0000
commit	215acbcc9667077fc665be6d5f81c66cf989891e (patch)
tree	291a607c6fd648b3488d6cc8f05a84ff4f134446 /OpenSim/Region/Physics/POSPlugin/POSPrim.cs
parent	Merge branch 'master' into careminster (diff)
parent	Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or... (diff)
download	opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.zip opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.tar.gz opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.tar.bz2 opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin/POSPrim.cs')

0 files changed, 0 insertions, 0 deletions