diff options
| author | Melanie | 2011-12-08 18:29:19 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-08 18:29:19 +0000 |
| commit | 96539ffc79c1654feddc17592170f0e4b57f5b8d (patch) | |
| tree | d500df1c7a7b37cae6e74d52b67f51aa7bfad46d /OpenSim/Framework/InventoryCollection.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | When a client connects to a scene, send other avatar appearance data asynchro... (diff) | |
| download | opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.zip opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.tar.gz opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.tar.bz2 opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/InventoryCollection.cs')
0 files changed, 0 insertions, 0 deletions