diff options
author | Melanie | 2011-10-30 10:16:25 +0000 |
---|---|---|
committer | Melanie | 2011-10-30 10:16:25 +0000 |
commit | 083b28de8c45589a43ce6ceed4dbfb70c698f2d0 (patch) | |
tree | fc494b5d401bf2190e8c2d9ee027021f330d6285 /OpenSim/Data | |
parent | Fix the offline message module to revert core changes and restore avn (diff) | |
parent | Add missing max_listens_per_region to [LL_Functions] config section in OpenSi... (diff) | |
download | opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.zip opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.gz opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.bz2 opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Data')
0 files changed, 0 insertions, 0 deletions