diff options
| author | Melanie | 2011-10-25 03:10:54 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:10:54 +0100 |
| commit | df430d572d8f5cc530e02888b0662ff6c4e74bd0 (patch) | |
| tree | 63e41f09ae80c59a830753285c0593ac73f82625 /OpenSim/Region/Framework/Scenes | |
| parent | Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge (diff) | |
| parent | Add "scripts suspend" and "scripts resume" commands. (diff) | |
| download | opensim-SC-df430d572d8f5cc530e02888b0662ff6c4e74bd0.zip opensim-SC-df430d572d8f5cc530e02888b0662ff6c4e74bd0.tar.gz opensim-SC-df430d572d8f5cc530e02888b0662ff6c4e74bd0.tar.bz2 opensim-SC-df430d572d8f5cc530e02888b0662ff6c4e74bd0.tar.xz | |
Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
0 files changed, 0 insertions, 0 deletions