aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:41:51 +0100
committerMelanie2011-10-11 22:41:51 +0100
commit2e47d248321a8433d4490b0d63f2355f3b38b6d5 (patch)
treec6f8bbe232406e941fa7c0528ac2b8a7c3631003 /bin/assets/TexturesAssetSet/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c
parentMerge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge (diff)
parentMove code which handles NPC movement into Scene so that this can also be used... (diff)
downloadopensim-SC_OLD-2e47d248321a8433d4490b0d63f2355f3b38b6d5.zip
opensim-SC_OLD-2e47d248321a8433d4490b0d63f2355f3b38b6d5.tar.gz
opensim-SC_OLD-2e47d248321a8433d4490b0d63f2355f3b38b6d5.tar.bz2
opensim-SC_OLD-2e47d248321a8433d4490b0d63f2355f3b38b6d5.tar.xz
Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2025-02-03 04:15:33 +0000