aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c
diff options
context:
space:
mode:
authorMelanie2011-10-11 21:10:55 +0100
committerMelanie2011-10-11 21:10:55 +0100
commit859a804d5909dee11d5b1b1da986c09c4879bfdf (patch)
tree3114c6e49a2b3acfc39572cc390ad9203d144e5f /bin/assets/TexturesAssetSet/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c
parentMerge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge (diff)
parentOnly bother to create an inventory xfer file if there are any items in a prim... (diff)
downloadopensim-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 'bin/assets/TexturesAssetSet/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-21 07:48:05 +0000