diff options
author | Melanie | 2011-10-11 21:10:55 +0100 |
---|---|---|
committer | Melanie | 2011-10-11 21:10:55 +0100 |
commit | 859a804d5909dee11d5b1b1da986c09c4879bfdf (patch) | |
tree | 3114c6e49a2b3acfc39572cc390ad9203d144e5f /ThirdPartyLicenses | |
parent | Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge (diff) | |
parent | Only bother to create an inventory xfer file if there are any items in a prim... (diff) | |
download | opensim-SC-859a804d5909dee11d5b1b1da986c09c4879bfdf.zip opensim-SC-859a804d5909dee11d5b1b1da986c09c4879bfdf.tar.gz opensim-SC-859a804d5909dee11d5b1b1da986c09c4879bfdf.tar.bz2 opensim-SC-859a804d5909dee11d5b1b1da986c09c4879bfdf.tar.xz |
Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions