aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
diff options
context:
space:
mode:
authorMelanie2012-03-06 01:18:37 +0000
committerMelanie2012-03-06 01:18:37 +0000
commitaf46650bae7152552a8773e42fd73762b9c9bfde (patch)
treef6546098abba7169c9caf2e36f7ec35767b38589 /bin/assets/TexturesAssetSet/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentGo back to setting appearance directly in NPCModule.SetAppearance() to fix ma... (diff)
downloadopensim-SC-af46650bae7152552a8773e42fd73762b9c9bfde.zip
opensim-SC-af46650bae7152552a8773e42fd73762b9c9bfde.tar.gz
opensim-SC-af46650bae7152552a8773e42fd73762b9c9bfde.tar.bz2
opensim-SC-af46650bae7152552a8773e42fd73762b9c9bfde.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-23 16:20:35 +0000