diff options
| author | Melanie | 2012-08-24 00:07:17 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-24 00:07:17 +0100 |
| commit | 783773a0c075893392847d9f16df3485985fa36a (patch) | |
| tree | 6a03e04e549ce05541f6d64563533cb6d4ee3272 /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | If a script state save fails for some reason on shutdown/region removal, get ... (diff) | |
| download | opensim-SC-783773a0c075893392847d9f16df3485985fa36a.zip opensim-SC-783773a0c075893392847d9f16df3485985fa36a.tar.gz opensim-SC-783773a0c075893392847d9f16df3485985fa36a.tar.bz2 opensim-SC-783773a0c075893392847d9f16df3485985fa36a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
0 files changed, 0 insertions, 0 deletions