aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c
diff options
context:
space:
mode:
authorMelanie2012-03-09 02:39:14 +0000
committerMelanie2012-03-09 02:39:14 +0000
commitdc5f831ca8bcaed77b65934a1c6d70c315a3834a (patch)
tree5f45c7e163096ef23f5139b9ddd3566a3621cd03 /bin/assets/TexturesAssetSet/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c
parentMerge branch 'master' into careminster (diff)
parentSimplify minimap coarse location code by just reference SP.AbsolutePosition (diff)
downloadopensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.zip
opensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.gz
opensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.bz2
opensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2025-01-05 14:34:29 +0000