diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs) | 78 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IEntity.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IHeightmap.cs) | 138 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHost.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs) | 82 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs) | 446 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObjectAccessor.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IObjectAccessor.cs) | 76 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IParcel.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs) | 84 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IPersistence.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs) | 112 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs | 43 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs) | 80 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs) | 114 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs | 18 |
14 files changed, 662 insertions, 614 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs index fef85dd..92ef490 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs | |||
@@ -1,39 +1,39 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
34 | { | 34 | { |
35 | public interface IAvatar : IEntity | 35 | public interface IAvatar : IEntity |
36 | { | 36 | { |
37 | 37 | ||
38 | } | 38 | } |
39 | } | 39 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IEntity.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs index 94c53e3..94c53e3 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IEntity.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs | |||
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs index f4bc12e..f4bc12e 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs | |||
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHeightmap.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs index 93cbc5b..eea1baf 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHeightmap.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs | |||
@@ -1,69 +1,69 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 32 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
33 | { | 33 | { |
34 | public interface IHeightmap | 34 | public interface IHeightmap |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Returns [or sets] the heightmap value at specified coordinates. | 37 | /// Returns [or sets] the heightmap value at specified coordinates. |
38 | /// </summary> | 38 | /// </summary> |
39 | /// <param name="x">X Coordinate</param> | 39 | /// <param name="x">X Coordinate</param> |
40 | /// <param name="y">Y Coordinate</param> | 40 | /// <param name="y">Y Coordinate</param> |
41 | /// <returns>A value in meters representing height. Can be negative. Value correlates with Z parameter in world coordinates</returns> | 41 | /// <returns>A value in meters representing height. Can be negative. Value correlates with Z parameter in world coordinates</returns> |
42 | /// <example> | 42 | /// <example> |
43 | /// double heightVal = World.Heightmap[128,128]; | 43 | /// double heightVal = World.Heightmap[128,128]; |
44 | /// World.Heightmap[128,128] *= 5.0; | 44 | /// World.Heightmap[128,128] *= 5.0; |
45 | /// World.Heightmap[128,128] = 25; | 45 | /// World.Heightmap[128,128] = 25; |
46 | /// </example> | 46 | /// </example> |
47 | double this[int x, int y] | 47 | double this[int x, int y] |
48 | { | 48 | { |
49 | get; | 49 | get; |
50 | set; | 50 | set; |
51 | } | 51 | } |
52 | 52 | ||
53 | /// <summary> | 53 | /// <summary> |
54 | /// The maximum length of the region (Y axis), exclusive. (eg Height = 256, max Y = 255). Minimum is always 0 inclusive. | 54 | /// The maximum length of the region (Y axis), exclusive. (eg Height = 256, max Y = 255). Minimum is always 0 inclusive. |
55 | /// </summary> | 55 | /// </summary> |
56 | /// <example> | 56 | /// <example> |
57 | /// Host.Console.Info("The terrain length of this region is " + World.Heightmap.Length); | 57 | /// Host.Console.Info("The terrain length of this region is " + World.Heightmap.Length); |
58 | /// </example> | 58 | /// </example> |
59 | int Length { get; } | 59 | int Length { get; } |
60 | 60 | ||
61 | /// <summary> | 61 | /// <summary> |
62 | /// The maximum width of the region (X axis), exclusive. (eg Width = 256, max X = 255). Minimum is always 0 inclusive. | 62 | /// The maximum width of the region (X axis), exclusive. (eg Width = 256, max X = 255). Minimum is always 0 inclusive. |
63 | /// </summary> | 63 | /// </summary> |
64 | /// <example> | 64 | /// <example> |
65 | /// Host.Console.Info("The terrain width of this region is " + World.Heightmap.Width); | 65 | /// Host.Console.Info("The terrain width of this region is " + World.Heightmap.Width); |
66 | /// </example> | 66 | /// </example> |
67 | int Width { get; } | 67 | int Width { get; } |
68 | } | 68 | } |
69 | } | 69 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHost.cs index 6c76919..8980b8f 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHost.cs | |||
@@ -1,41 +1,41 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using log4net; | 31 | using log4net; |
32 | 32 | ||
33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
34 | { | 34 | { |
35 | public interface IHost | 35 | public interface IHost |
36 | { | 36 | { |
37 | IObject Object { get; } | 37 | IObject Object { get; } |
38 | ILog Console { get; } | 38 | ILog Console { get; } |
39 | IGraphics Graphics { get; } | 39 | IGraphics Graphics { get; } |
40 | } | 40 | } |
41 | } | 41 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs index dc2e3fa..e17b716 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs | |||
@@ -1,223 +1,223 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Drawing; | 29 | using System.Drawing; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object; | 31 | using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object; |
32 | 32 | ||
33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
34 | { | 34 | { |
35 | public class TouchEventArgs : EventArgs | 35 | public class TouchEventArgs : EventArgs |
36 | { | 36 | { |
37 | public IAvatar Avatar; | 37 | public IAvatar Avatar; |
38 | 38 | ||
39 | public Vector3 TouchBiNormal; | 39 | public Vector3 TouchBiNormal; |
40 | public Vector3 TouchNormal; | 40 | public Vector3 TouchNormal; |
41 | public Vector3 TouchPosition; | 41 | public Vector3 TouchPosition; |
42 | 42 | ||
43 | public Vector2 TouchUV; | 43 | public Vector2 TouchUV; |
44 | public Vector2 TouchST; | 44 | public Vector2 TouchST; |
45 | 45 | ||
46 | public int TouchMaterialIndex; | 46 | public int TouchMaterialIndex; |
47 | } | 47 | } |
48 | 48 | ||
49 | public delegate void OnTouchDelegate(IObject sender, TouchEventArgs e); | 49 | public delegate void OnTouchDelegate(IObject sender, TouchEventArgs e); |
50 | 50 | ||
51 | public interface IObject : IEntity | 51 | public interface IObject : IEntity |
52 | { | 52 | { |
53 | #region Events | 53 | #region Events |
54 | 54 | ||
55 | event OnTouchDelegate OnTouch; | 55 | event OnTouchDelegate OnTouch; |
56 | 56 | ||
57 | #endregion | 57 | #endregion |
58 | 58 | ||
59 | /// <summary> | 59 | /// <summary> |
60 | /// Returns whether or not this object is still in the world. | 60 | /// Returns whether or not this object is still in the world. |
61 | /// Eg, if you store an IObject reference, however the object | 61 | /// Eg, if you store an IObject reference, however the object |
62 | /// is deleted before you use it, it will throw a NullReference | 62 | /// is deleted before you use it, it will throw a NullReference |
63 | /// exception. 'Exists' allows you to check the object is still | 63 | /// exception. 'Exists' allows you to check the object is still |
64 | /// in play before utilizing it. | 64 | /// in play before utilizing it. |
65 | /// </summary> | 65 | /// </summary> |
66 | /// <example> | 66 | /// <example> |
67 | /// IObject deleteMe = World.Objects[0]; | 67 | /// IObject deleteMe = World.Objects[0]; |
68 | /// | 68 | /// |
69 | /// if (deleteMe.Exists) { | 69 | /// if (deleteMe.Exists) { |
70 | /// deleteMe.Say("Hello, I still exist!"); | 70 | /// deleteMe.Say("Hello, I still exist!"); |
71 | /// } | 71 | /// } |
72 | /// | 72 | /// |
73 | /// World.Objects.Remove(deleteMe); | 73 | /// World.Objects.Remove(deleteMe); |
74 | /// | 74 | /// |
75 | /// if (!deleteMe.Exists) { | 75 | /// if (!deleteMe.Exists) { |
76 | /// Host.Console.Info("I was deleted"); | 76 | /// Host.Console.Info("I was deleted"); |
77 | /// } | 77 | /// } |
78 | /// </example> | 78 | /// </example> |
79 | /// <remarks> | 79 | /// <remarks> |
80 | /// Objects should be near-guarunteed to exist for any event which | 80 | /// Objects should be near-guarunteed to exist for any event which |
81 | /// passes them as an argument. Storing an object for a longer period | 81 | /// passes them as an argument. Storing an object for a longer period |
82 | /// of time however will limit their reliability. | 82 | /// of time however will limit their reliability. |
83 | /// | 83 | /// |
84 | /// It is a good practice to use Try/Catch blocks handling for | 84 | /// It is a good practice to use Try/Catch blocks handling for |
85 | /// NullReferenceException, when accessing remote objects. | 85 | /// NullReferenceException, when accessing remote objects. |
86 | /// </remarks> | 86 | /// </remarks> |
87 | bool Exists { get; } | 87 | bool Exists { get; } |
88 | 88 | ||
89 | /// <summary> | 89 | /// <summary> |
90 | /// The local region-unique ID for this object. | 90 | /// The local region-unique ID for this object. |
91 | /// </summary> | 91 | /// </summary> |
92 | uint LocalID { get; } | 92 | uint LocalID { get; } |
93 | 93 | ||
94 | /// <summary> | 94 | /// <summary> |
95 | /// The description assigned to this object. | 95 | /// The description assigned to this object. |
96 | /// </summary> | 96 | /// </summary> |
97 | String Description { get; set; } | 97 | String Description { get; set; } |
98 | 98 | ||
99 | /// <summary> | 99 | /// <summary> |
100 | /// Returns the root object of a linkset. If this object is the root, it will return itself. | 100 | /// Returns the root object of a linkset. If this object is the root, it will return itself. |
101 | /// </summary> | 101 | /// </summary> |
102 | IObject Root { get; } | 102 | IObject Root { get; } |
103 | 103 | ||
104 | /// <summary> | 104 | /// <summary> |
105 | /// Returns a collection of objects which are linked to the current object. Does not include the root object. | 105 | /// Returns a collection of objects which are linked to the current object. Does not include the root object. |
106 | /// </summary> | 106 | /// </summary> |
107 | IObject[] Children { get; } | 107 | IObject[] Children { get; } |
108 | 108 | ||
109 | /// <summary> | 109 | /// <summary> |
110 | /// Returns a list of materials attached to this object. Each may contain unique texture | 110 | /// Returns a list of materials attached to this object. Each may contain unique texture |
111 | /// and other visual information. For primitive based objects, this correlates with | 111 | /// and other visual information. For primitive based objects, this correlates with |
112 | /// Object Faces. For mesh based objects, this correlates with Materials. | 112 | /// Object Faces. For mesh based objects, this correlates with Materials. |
113 | /// </summary> | 113 | /// </summary> |
114 | IObjectMaterial[] Materials { get; } | 114 | IObjectMaterial[] Materials { get; } |
115 | 115 | ||
116 | /// <summary> | 116 | /// <summary> |
117 | /// The bounding box of the object. Primitive and Mesh objects alike are scaled to fit within these bounds. | 117 | /// The bounding box of the object. Primitive and Mesh objects alike are scaled to fit within these bounds. |
118 | /// </summary> | 118 | /// </summary> |
119 | Vector3 Scale { get; set; } | 119 | Vector3 Scale { get; set; } |
120 | 120 | ||
121 | /// <summary> | 121 | /// <summary> |
122 | /// The rotation of the object relative to the Scene | 122 | /// The rotation of the object relative to the Scene |
123 | /// </summary> | 123 | /// </summary> |
124 | Quaternion WorldRotation { get; set; } | 124 | Quaternion WorldRotation { get; set; } |
125 | 125 | ||
126 | /// <summary> | 126 | /// <summary> |
127 | /// The rotation of the object relative to a parent object | 127 | /// The rotation of the object relative to a parent object |
128 | /// If root, works the same as WorldRotation | 128 | /// If root, works the same as WorldRotation |
129 | /// </summary> | 129 | /// </summary> |
130 | Quaternion OffsetRotation { get; set; } | 130 | Quaternion OffsetRotation { get; set; } |
131 | 131 | ||
132 | /// <summary> | 132 | /// <summary> |
133 | /// The position of the object relative to a parent object | 133 | /// The position of the object relative to a parent object |
134 | /// If root, works the same as WorldPosition | 134 | /// If root, works the same as WorldPosition |
135 | /// </summary> | 135 | /// </summary> |
136 | Vector3 OffsetPosition { get; set; } | 136 | Vector3 OffsetPosition { get; set; } |
137 | 137 | ||
138 | Vector3 SitTarget { get; set; } | 138 | Vector3 SitTarget { get; set; } |
139 | String SitTargetText { get; set; } | 139 | String SitTargetText { get; set; } |
140 | 140 | ||
141 | String TouchText { get; set; } | 141 | String TouchText { get; set; } |
142 | 142 | ||
143 | /// <summary> | 143 | /// <summary> |
144 | /// Text to be associated with this object, in the | 144 | /// Text to be associated with this object, in the |
145 | /// Second Life(r) viewer, this is shown above the | 145 | /// Second Life(r) viewer, this is shown above the |
146 | /// object. | 146 | /// object. |
147 | /// </summary> | 147 | /// </summary> |
148 | String Text { get; set; } | 148 | String Text { get; set; } |
149 | 149 | ||
150 | bool IsRotationLockedX { get; set; } // SetStatus(!ROTATE_X) | 150 | bool IsRotationLockedX { get; set; } // SetStatus(!ROTATE_X) |
151 | bool IsRotationLockedY { get; set; } // SetStatus(!ROTATE_Y) | 151 | bool IsRotationLockedY { get; set; } // SetStatus(!ROTATE_Y) |
152 | bool IsRotationLockedZ { get; set; } // SetStatus(!ROTATE_Z) | 152 | bool IsRotationLockedZ { get; set; } // SetStatus(!ROTATE_Z) |
153 | bool IsSandboxed { get; set; } // SetStatus(SANDBOX) | 153 | bool IsSandboxed { get; set; } // SetStatus(SANDBOX) |
154 | bool IsImmotile { get; set; } // SetStatus(BLOCK_GRAB) | 154 | bool IsImmotile { get; set; } // SetStatus(BLOCK_GRAB) |
155 | bool IsAlwaysReturned { get; set; } // SetStatus(!DIE_AT_EDGE) | 155 | bool IsAlwaysReturned { get; set; } // SetStatus(!DIE_AT_EDGE) |
156 | bool IsTemporary { get; set; } // TEMP_ON_REZ | 156 | bool IsTemporary { get; set; } // TEMP_ON_REZ |
157 | 157 | ||
158 | bool IsFlexible { get; set; } | 158 | bool IsFlexible { get; set; } |
159 | 159 | ||
160 | PrimType PrimShape { get; set; } | 160 | PrimType PrimShape { get; set; } |
161 | // TODO: | 161 | // TODO: |
162 | // PrimHole | 162 | // PrimHole |
163 | // Repeats, Offsets, Cut/Dimple/ProfileCut | 163 | // Repeats, Offsets, Cut/Dimple/ProfileCut |
164 | // Hollow, Twist, HoleSize, | 164 | // Hollow, Twist, HoleSize, |
165 | // Taper[A+B], Shear[A+B], Revolutions, | 165 | // Taper[A+B], Shear[A+B], Revolutions, |
166 | // RadiusOffset, Skew | 166 | // RadiusOffset, Skew |
167 | 167 | ||
168 | PhysicsMaterial PhysicsMaterial { get; set; } | 168 | PhysicsMaterial PhysicsMaterial { get; set; } |
169 | 169 | ||
170 | IObjectPhysics Physics { get; } | 170 | IObjectPhysics Physics { get; } |
171 | 171 | ||
172 | 172 | ||
173 | /// <summary> | 173 | /// <summary> |
174 | /// Causes the object to speak to its surroundings, | 174 | /// Causes the object to speak to its surroundings, |
175 | /// equivilent to LSL/OSSL llSay | 175 | /// equivilent to LSL/OSSL llSay |
176 | /// </summary> | 176 | /// </summary> |
177 | /// <param name="msg">The message to send to the user</param> | 177 | /// <param name="msg">The message to send to the user</param> |
178 | void Say(string msg); | 178 | void Say(string msg); |
179 | 179 | ||
180 | } | 180 | } |
181 | 181 | ||
182 | public enum PhysicsMaterial | 182 | public enum PhysicsMaterial |
183 | { | 183 | { |
184 | Default, | 184 | Default, |
185 | Glass, | 185 | Glass, |
186 | Metal, | 186 | Metal, |
187 | Plastic, | 187 | Plastic, |
188 | Wood, | 188 | Wood, |
189 | Rubber, | 189 | Rubber, |
190 | Stone, | 190 | Stone, |
191 | Flesh | 191 | Flesh |
192 | } | 192 | } |
193 | 193 | ||
194 | public enum PrimType | 194 | public enum PrimType |
195 | { | 195 | { |
196 | NotPrimitive = 255, | 196 | NotPrimitive = 255, |
197 | Box = 0, | 197 | Box = 0, |
198 | Cylinder = 1, | 198 | Cylinder = 1, |
199 | Prism = 2, | 199 | Prism = 2, |
200 | Sphere = 3, | 200 | Sphere = 3, |
201 | Torus = 4, | 201 | Torus = 4, |
202 | Tube = 5, | 202 | Tube = 5, |
203 | Ring = 6, | 203 | Ring = 6, |
204 | Sculpt = 7 | 204 | Sculpt = 7 |
205 | } | 205 | } |
206 | 206 | ||
207 | public enum TextureMapping | 207 | public enum TextureMapping |
208 | { | 208 | { |
209 | Default, | 209 | Default, |
210 | Planar | 210 | Planar |
211 | } | 211 | } |
212 | 212 | ||
213 | public interface IObjectMaterial | 213 | public interface IObjectMaterial |
214 | { | 214 | { |
215 | Color Color { get; set; } | 215 | Color Color { get; set; } |
216 | UUID Texture { get; set; } | 216 | UUID Texture { get; set; } |
217 | TextureMapping Mapping { get; set; } // SetPrimParms(PRIM_TEXGEN) | 217 | TextureMapping Mapping { get; set; } // SetPrimParms(PRIM_TEXGEN) |
218 | bool Bright { get; set; } // SetPrimParms(FULLBRIGHT) | 218 | bool Bright { get; set; } // SetPrimParms(FULLBRIGHT) |
219 | double Bloom { get; set; } // SetPrimParms(GLOW) | 219 | double Bloom { get; set; } // SetPrimParms(GLOW) |
220 | bool Shiny { get; set; } // SetPrimParms(SHINY) | 220 | bool Shiny { get; set; } // SetPrimParms(SHINY) |
221 | bool BumpMap { get; set; } // SetPrimParms(BUMPMAP) [DEPRECIATE IN FAVOUR OF UUID?] | 221 | bool BumpMap { get; set; } // SetPrimParms(BUMPMAP) [DEPRECIATE IN FAVOUR OF UUID?] |
222 | } | 222 | } |
223 | } | 223 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObjectAccessor.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObjectAccessor.cs index 7aed41b..cd27a6a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObjectAccessor.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObjectAccessor.cs | |||
@@ -1,39 +1,39 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 31 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
32 | { | 32 | { |
33 | public interface IObjectAccessor : ICollection<IObject> | 33 | public interface IObjectAccessor : ICollection<IObject> |
34 | { | 34 | { |
35 | IObject this[int index] { get; } | 35 | IObject this[int index] { get; } |
36 | IObject this[uint index] { get; } | 36 | IObject this[uint index] { get; } |
37 | IObject this[UUID index] { get; } | 37 | IObject this[UUID index] { get; } |
38 | } | 38 | } |
39 | } \ No newline at end of file | 39 | } \ No newline at end of file |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IParcel.cs index 759b26d..3b229a7 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IParcel.cs | |||
@@ -1,42 +1,42 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
34 | { | 34 | { |
35 | public interface IParcel | 35 | public interface IParcel |
36 | { | 36 | { |
37 | string Name { get; set; } | 37 | string Name { get; set; } |
38 | string Description { get; set; } | 38 | string Description { get; set; } |
39 | ISocialEntity Owner { get; set; } | 39 | ISocialEntity Owner { get; set; } |
40 | bool[,] Bitmap { get; } | 40 | bool[,] Bitmap { get; } |
41 | } | 41 | } |
42 | } | 42 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IPersistence.cs index 17bb6e7..bde51fe 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IPersistence.cs | |||
@@ -1,56 +1,56 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 32 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
33 | { | 33 | { |
34 | interface IPersistence | 34 | interface IPersistence |
35 | { | 35 | { |
36 | T Get<T>(Guid storageID); | 36 | T Get<T>(Guid storageID); |
37 | T Get<T>(); | 37 | T Get<T>(); |
38 | 38 | ||
39 | /// <summary> | 39 | /// <summary> |
40 | /// Stores 'data' into the persistence system | 40 | /// Stores 'data' into the persistence system |
41 | /// associated with this object, however saved | 41 | /// associated with this object, however saved |
42 | /// under the ID 'storageID'. This data may | 42 | /// under the ID 'storageID'. This data may |
43 | /// be accessed by other scripts however. | 43 | /// be accessed by other scripts however. |
44 | /// </summary> | 44 | /// </summary> |
45 | /// <param name="storageID"></param> | 45 | /// <param name="storageID"></param> |
46 | /// <param name="data"></param> | 46 | /// <param name="data"></param> |
47 | void Put<T>(Guid storageID, T data); | 47 | void Put<T>(Guid storageID, T data); |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Stores 'data' into the persistence system | 50 | /// Stores 'data' into the persistence system |
51 | /// using the default ID for this script. | 51 | /// using the default ID for this script. |
52 | /// </summary> | 52 | /// </summary> |
53 | /// <param name="data"></param> | 53 | /// <param name="data"></param> |
54 | void Put<T>(T data); | 54 | void Put<T>(T data); |
55 | } | 55 | } |
56 | } | 56 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs new file mode 100644 index 0000000..cf45de7 --- /dev/null +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs | |||
@@ -0,0 +1,43 @@ | |||
1 | using System; | ||
2 | |||
3 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | ||
4 | { | ||
5 | interface IScheduler | ||
6 | { | ||
7 | /// <summary> | ||
8 | /// Schedule an event callback to occur | ||
9 | /// when 'time' is elapsed. | ||
10 | /// </summary> | ||
11 | /// <param name="time">The period to wait before executing</param> | ||
12 | void RunIn(TimeSpan time); | ||
13 | |||
14 | /// <summary> | ||
15 | /// Schedule an event callback to fire | ||
16 | /// every "time". Equivilent to a repeating | ||
17 | /// timer. | ||
18 | /// </summary> | ||
19 | /// <param name="time">The period to wait between executions</param> | ||
20 | void RunAndRepeat(TimeSpan time); | ||
21 | |||
22 | /// <summary> | ||
23 | /// Fire this scheduler only when the region has | ||
24 | /// a user in it. | ||
25 | /// </summary> | ||
26 | bool WhenRegionOccupied { get; set; } | ||
27 | |||
28 | /// <summary> | ||
29 | /// Fire this event only when the region is visible | ||
30 | /// to a child agent, or there is a full agent | ||
31 | /// in this region. | ||
32 | /// </summary> | ||
33 | bool WhenRegionVisible { get; set; } | ||
34 | |||
35 | /// <summary> | ||
36 | /// Determines whether this runs in the master scheduler thread, or a new thread | ||
37 | /// is spawned to handle your request. Running in scheduler may mean that your | ||
38 | /// code does not execute perfectly on time, however will result in a lower | ||
39 | /// processor cost to running your code. | ||
40 | /// </summary> | ||
41 | bool Schedule { get; set; } | ||
42 | } | ||
43 | } | ||
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs index 400367f..cbac123 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs | |||
@@ -1,41 +1,41 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
34 | { | 34 | { |
35 | public interface ISocialEntity | 35 | public interface ISocialEntity |
36 | { | 36 | { |
37 | UUID GlobalID { get; } | 37 | UUID GlobalID { get; } |
38 | string Name { get; } | 38 | string Name { get; } |
39 | bool IsUser { get; } | 39 | bool IsUser { get; } |
40 | } | 40 | } |
41 | } \ No newline at end of file | 41 | } \ No newline at end of file |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs index acb569f..9196acd 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs | |||
@@ -1,57 +1,57 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 30 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
31 | { | 31 | { |
32 | public class NewUserEventArgs : EventArgs | 32 | public class NewUserEventArgs : EventArgs |
33 | { | 33 | { |
34 | public IAvatar Avatar; | 34 | public IAvatar Avatar; |
35 | } | 35 | } |
36 | 36 | ||
37 | public delegate void OnNewUserDelegate(IWorld sender, NewUserEventArgs e); | 37 | public delegate void OnNewUserDelegate(IWorld sender, NewUserEventArgs e); |
38 | 38 | ||
39 | public class ChatEventArgs : EventArgs | 39 | public class ChatEventArgs : EventArgs |
40 | { | 40 | { |
41 | public string Text; | 41 | public string Text; |
42 | public IEntity Sender; | 42 | public IEntity Sender; |
43 | } | 43 | } |
44 | 44 | ||
45 | public delegate void OnChatDelegate(IWorld sender, ChatEventArgs e); | 45 | public delegate void OnChatDelegate(IWorld sender, ChatEventArgs e); |
46 | 46 | ||
47 | public interface IWorld | 47 | public interface IWorld |
48 | { | 48 | { |
49 | IObjectAccessor Objects { get; } | 49 | IObjectAccessor Objects { get; } |
50 | IAvatar[] Avatars { get; } | 50 | IAvatar[] Avatars { get; } |
51 | IParcel[] Parcels { get; } | 51 | IParcel[] Parcels { get; } |
52 | IHeightmap Terrain { get; } | 52 | IHeightmap Terrain { get; } |
53 | 53 | ||
54 | event OnChatDelegate OnChat; | 54 | event OnChatDelegate OnChat; |
55 | event OnNewUserDelegate OnNewUser; | 55 | event OnNewUserDelegate OnNewUser; |
56 | } | 56 | } |
57 | } | 57 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs index 94de09e..57d84e1 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs | |||
@@ -1,7 +1,4 @@ | |||
1 | using System; | 1 | using System.Drawing; |
2 | using System.Collections.Generic; | ||
3 | using System.Drawing; | ||
4 | using System.Text; | ||
5 | using OpenMetaverse; | 2 | using OpenMetaverse; |
6 | using OpenSim.Region.Framework.Scenes; | 3 | using OpenSim.Region.Framework.Scenes; |
7 | 4 | ||
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs index 7e8db9c..755831c 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs | |||
@@ -38,13 +38,21 @@ namespace OpenSim | |||
38 | 38 | ||
39 | void World_OnChat(IWorld sender, ChatEventArgs e) | 39 | void World_OnChat(IWorld sender, ChatEventArgs e) |
40 | { | 40 | { |
41 | if(!e.Text.Contains("hic!")) | 41 | if (e.Sender is IAvatar) |
42 | { | 42 | { |
43 | e.Text = e.Text.Replace("s", "sh"); | 43 | if (!e.Text.Contains("hic!")) |
44 | e.Text = e.Text.Replace("S", "Sh"); | 44 | { |
45 | e.Text += " ...hic!"; | 45 | e.Text = e.Text.Replace("s", "sh"); |
46 | e.Text = e.Text.Replace("S", "Sh"); | ||
47 | e.Text += " ...hic!"; | ||
46 | 48 | ||
47 | Host.Object.Say(e.Text); | 49 | Host.Object.Say(e.Text); |
50 | } | ||
51 | } | ||
52 | |||
53 | if(e.Sender is IObject) | ||
54 | { | ||
55 | // Ignore | ||
48 | } | 56 | } |
49 | } | 57 | } |
50 | 58 | ||