diff options
| author | Melanie | 2012-03-15 10:55:44 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-15 10:55:44 +0000 |
| commit | 897dc5e77eff911f9dd8870535c442f632d17662 (patch) | |
| tree | 4bd4606e27f4c346f0267f6fc03c4541a2dc7046 /ThirdPartyLicenses/OpenJpeg.txt | |
| parent | Allow llTeleportAgent to teleport gods when not in god mode (diff) | |
| parent | Remove property/field duplication in ScriptInstance where it's unnecessary. (diff) | |
| download | opensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.zip opensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.tar.gz opensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.tar.bz2 opensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'ThirdPartyLicenses/OpenJpeg.txt')
0 files changed, 0 insertions, 0 deletions