diff options
| author | Melanie | 2012-10-12 19:05:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:05:06 +0100 |
| commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
| tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /OpenSim/Framework/InventoryCollection.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
| download | opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/InventoryCollection.cs')
0 files changed, 0 insertions, 0 deletions