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

diff options

author	Melanie	2011-10-11 21:06:06 +0100
committer	Melanie	2011-10-11 21:06:06 +0100
commit	c95c8ab246132295d2700683feda937d13d14ea5 (patch)
tree	3114c6e49a2b3acfc39572cc390ad9203d144e5f /OpenSim/Region/Physics/POSPlugin/POSPrim.cs
parent	Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge (diff)
parent	Shuffle order of code in invnetory connector GetFolderContent() calls to avoi... (diff)
download	opensim-SC_OLD-c95c8ab246132295d2700683feda937d13d14ea5.zip opensim-SC_OLD-c95c8ab246132295d2700683feda937d13d14ea5.tar.gz opensim-SC_OLD-c95c8ab246132295d2700683feda937d13d14ea5.tar.bz2 opensim-SC_OLD-c95c8ab246132295d2700683feda937d13d14ea5.tar.xz

Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

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

0 files changed, 0 insertions, 0 deletions