aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/a6162133-724b-54df-a12f-51cd070ad6f3.j2c
diff options
context:
space:
mode:
authorMelanie2012-06-11 16:56:40 +0100
committerMelanie2012-06-11 16:56:40 +0100
commit84377a23db64c67fc8f673edf4acc0c4a1541d5c (patch)
treec22592aaf31bee652924b8016b60d24096d441c5 /bin/assets/TexturesAssetSet/a6162133-724b-54df-a12f-51cd070ad6f3.j2c
parentMerge branch 'master' into careminster (diff)
parentMake llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba... (diff)
downloadopensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.zip
opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.gz
opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.bz2
opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/a6162133-724b-54df-a12f-51cd070ad6f3.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2025-02-27 08:19:33 +0000