diff options
| author | Dan Lake | 2012-02-03 15:21:07 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-03 15:21:07 -0800 |
| commit | ea19e50919afdf2aee3d123437eef82fc59663a1 (patch) | |
| tree | c45b94ef98eab9115a69d70c4159769daea5c3d1 /.gitignore | |
| parent | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before tri... (diff) | |
| parent | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff) | |
| download | opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.zip opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.tar.gz opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.tar.bz2 opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions