diff options
| author | Justin Clark-Casey (justincc) | 2010-08-26 00:35:03 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-26 00:35:03 +0100 |
| commit | 87a6554d4b10ebde08de91e10d050a2c7343b865 (patch) | |
| tree | beb5333563ee8d0ff0604b0c7879eb7350193c61 /OpenSim/Tests/Common/Setup | |
| parent | Remove parts locking from data classes since these are using a copy of the sc... (diff) | |
| parent | Prevent an object disposed exception that made forms comms unreliable. After (diff) | |
| download | opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.zip opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.tar.gz opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.tar.bz2 opensim-SC_OLD-87a6554d4b10ebde08de91e10d050a2c7343b865.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Resolve merge conflicts
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
0 files changed, 0 insertions, 0 deletions