diff options
| author | Melanie | 2012-03-06 01:18:37 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-06 01:18:37 +0000 |
| commit | af46650bae7152552a8773e42fd73762b9c9bfde (patch) | |
| tree | f6546098abba7169c9caf2e36f7ec35767b38589 /bin/assets | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Go back to setting appearance directly in NPCModule.SetAppearance() to fix ma... (diff) | |
| download | opensim-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 '')
0 files changed, 0 insertions, 0 deletions