diff options
| author | Melanie | 2013-10-06 18:33:49 +0100 |
|---|---|---|
| committer | Melanie | 2013-10-06 18:33:49 +0100 |
| commit | 9800c6fa6c95e124e16e3f759997f3d78c9ebd38 (patch) | |
| tree | 4d88e53689e05d3e38d6b4a68d46e30c88de846f /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho... (diff) | |
| download | opensim-SC-9800c6fa6c95e124e16e3f759997f3d78c9ebd38.zip opensim-SC-9800c6fa6c95e124e16e3f759997f3d78c9ebd38.tar.gz opensim-SC-9800c6fa6c95e124e16e3f759997f3d78c9ebd38.tar.bz2 opensim-SC-9800c6fa6c95e124e16e3f759997f3d78c9ebd38.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 2427cbe..275b608 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -1241,4 +1241,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 1241 | return null; | 1241 | return null; |
| 1242 | } | 1242 | } |
| 1243 | } | 1243 | } |
| 1244 | } \ No newline at end of file | 1244 | } |