aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c
diff options
context:
space:
mode:
authorMelanie2013-03-22 01:01:24 +0000
committerMelanie2013-03-22 01:01:24 +0000
commit68b910c1ff03d241e2aec65ebe67ffaa58babbf6 (patch)
tree7b59aed339b6d13602b0ba9d65d04b9a920abe00 /bin/assets/TexturesAssetSet/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c
parentMerge branch 'avination' into careminster (diff)
parentImplement chat across region borders since we can tell if avatars in neighbou... (diff)
downloadopensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.zip
opensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.gz
opensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.bz2
opensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2025-02-02 15:11:29 +0000