aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
diff options
context:
space:
mode:
authorMelanie2012-03-23 02:44:22 +0000
committerMelanie2012-03-23 02:44:22 +0000
commit2190a62366a633e93e2d4b0284962127f1a5cbf9 (patch)
tree326b866b027bd57c8edf158a5514b13c4ad20768 /bin/assets/TexturesAssetSet/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
parentMerge branch 'master' into careminster (diff)
parentRemove unnecessary shutting down check in Scene.Heartbeat(). Add some method... (diff)
downloadopensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.zip
opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.gz
opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.bz2
opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.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-22 20:13:25 +0000