aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
diff options
context:
space:
mode:
authorMelanie2012-08-03 16:46:11 +0100
committerMelanie2012-08-03 16:46:11 +0100
commit0c00abcce18d00ae151a7340b808ffe8d7e200ef (patch)
tree3f19d7653c984120f16b3a2ea74ccf6b34928a2e /bin/assets/TexturesAssetSet/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
parentMerge branch 'master' into careminster (diff)
parentrefactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff)
downloadopensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.zip
opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.gz
opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.bz2
opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-30 03:13:15 +0000