diff options
author | lbsa71 | 2007-10-15 07:10:21 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-15 07:10:21 +0000 |
commit | 849eaffbe5fc59015adb7795e76b0b039e2c5cb0 (patch) | |
tree | bcd8ae53a540a00bc789655f20ed8187a0882994 /OpenSim/Region/Environment/Scenes/Scripting | |
parent | * Applied Chillken patch #418 : newline-r2092.patch ; failed on assemblyinfo ... (diff) | |
download | opensim-SC-849eaffbe5fc59015adb7795e76b0b039e2c5cb0.zip opensim-SC-849eaffbe5fc59015adb7795e76b0b039e2c5cb0.tar.gz opensim-SC-849eaffbe5fc59015adb7795e76b0b039e2c5cb0.tar.bz2 opensim-SC-849eaffbe5fc59015adb7795e76b0b039e2c5cb0.tar.xz |
* Applied patch #418 : copyright-r2012.patch - some errors, but got most thru
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scripting')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | 30 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | 30 |
2 files changed, 58 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs index baaeb86..01c1d65 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | |||
@@ -1,3 +1,31 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
1 | using Axiom.Math; | 29 | using Axiom.Math; |
2 | using libsecondlife; | 30 | using libsecondlife; |
3 | 31 | ||
@@ -15,4 +43,4 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
15 | LLVector3 AbsolutePosition { get; } | 43 | LLVector3 AbsolutePosition { get; } |
16 | void SetText(string text, Vector3 color, double alpha); | 44 | void SetText(string text, Vector3 color, double alpha); |
17 | } | 45 | } |
18 | } \ No newline at end of file | 46 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index 2337aba..2fb3e78 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | |||
@@ -1,3 +1,31 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
1 | using System; | 29 | using System; |
2 | using Axiom.Math; | 30 | using Axiom.Math; |
3 | using libsecondlife; | 31 | using libsecondlife; |
@@ -57,4 +85,4 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
57 | Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); | 85 | Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); |
58 | } | 86 | } |
59 | } | 87 | } |
60 | } \ No newline at end of file | 88 | } |