diff options
author | Melanie Thielker | 2015-11-16 15:28:51 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-11-16 15:28:51 +0100 |
commit | f93ce485b1df8c1c8a7ff1a44b280ce30b8707b9 (patch) | |
tree | f047a5e4f8907d21b06a200291aa47f5c4fe2a4a /share/regions/config_134.xml | |
parent | handle diferente number of wearables on getting assets form another appearance (diff) | |
parent | fix the protection for more Wearables than region suports (diff) | |
download | opensim-SC-0.9.0.zip opensim-SC-0.9.0.tar.gz opensim-SC-0.9.0.tar.bz2 opensim-SC-0.9.0.tar.xz |
Merge branch 'master' into avinationmerge0.9.0
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
Diffstat (limited to 'share/regions/config_134.xml')
0 files changed, 0 insertions, 0 deletions