diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | bad merge? (diff) | |
| download | opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 5fdbf9d..6e8a96d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -739,11 +739,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 739 | if (Position.y > ((int)Constants.RegionSize - 1)) | 739 | if (Position.y > ((int)Constants.RegionSize - 1)) |
| 740 | Position.y = ((int)Constants.RegionSize - 1); | 740 | Position.y = ((int)Constants.RegionSize - 1); |
| 741 | */ | 741 | */ |
| 742 | <<<<<<< HEAD | ||
| 743 | if (Position.z > Constants.RegionHeight) | 742 | if (Position.z > Constants.RegionHeight) |
| 744 | Position.z = Constants.RegionHeight; | 743 | Position.z = Constants.RegionHeight; |
| 745 | ======= | ||
| 746 | >>>>>>> avn/ubitvar | ||
| 747 | if (Position.x < 0) | 744 | if (Position.x < 0) |
| 748 | Position.x = 0; | 745 | Position.x = 0; |
| 749 | if (Position.y < 0) | 746 | if (Position.y < 0) |