diff options
| author | Melanie | 2011-11-17 19:04:27 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-17 19:04:27 +0000 |
| commit | 31736b1aac0387e51fe37ea9bab2e2e8c86988b6 (patch) | |
| tree | 14fbdc5f9b677185db1fe8080dafe28796c09336 /OpenSim/Region/Environment | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow... (diff) | |
| download | opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.zip opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.gz opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.bz2 opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Region/Environment')
0 files changed, 0 insertions, 0 deletions