diff options
| author | Melanie Thielker | 2014-07-19 22:32:07 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-07-19 22:32:07 +0200 |
| commit | e1b2ecdfdc5d465ee86d2a726eff2e504c846e79 (patch) | |
| tree | fa54372d3e4434ed14ff773c0889364895f87529 /OpenSim/Framework/SimStats.cs | |
| parent | fix attachments (diff) | |
| parent | revert to capsule representation of avatar collider (diff) | |
| download | opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.zip opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.gz opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.bz2 opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.xz | |
Merge branch 'avination-current'
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Framework/SimStats.cs')
0 files changed, 0 insertions, 0 deletions