aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim/Framework/Tests/AssetBaseTest.cs98
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs96
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs78
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs28
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs24
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs138
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHost.cs82
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs446
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObjectAccessor.cs76
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IParcel.cs84
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IPersistence.cs112
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs86
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs80
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs114
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs176
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs126
-rw-r--r--OpenSim/Tests/Common/DatabaseTestAttribute.cs32
-rw-r--r--OpenSim/Tests/Common/LongRunningAttribute.cs44
18 files changed, 960 insertions, 960 deletions
diff --git a/OpenSim/Framework/Tests/AssetBaseTest.cs b/OpenSim/Framework/Tests/AssetBaseTest.cs
index 800b41b..f5f15dc 100644
--- a/OpenSim/Framework/Tests/AssetBaseTest.cs
+++ b/OpenSim/Framework/Tests/AssetBaseTest.cs
@@ -1,49 +1,49 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using NUnit.Framework; 4using NUnit.Framework;
5using OpenMetaverse; 5using OpenMetaverse;
6 6
7namespace OpenSim.Framework.Tests 7namespace OpenSim.Framework.Tests
8{ 8{
9 [TestFixture] 9 [TestFixture]
10 public class AssetBaseTest 10 public class AssetBaseTest
11 { 11 {
12 [Test] 12 [Test]
13 public void TestContainsReferences() 13 public void TestContainsReferences()
14 { 14 {
15 TestContainsReferences(AssetType.Bodypart, true); 15 TestContainsReferences(AssetType.Bodypart, true);
16 TestContainsReferences(AssetType.Clothing, true); 16 TestContainsReferences(AssetType.Clothing, true);
17 17
18 TestContainsReferences(AssetType.Animation, false); 18 TestContainsReferences(AssetType.Animation, false);
19 TestContainsReferences(AssetType.CallingCard, false); 19 TestContainsReferences(AssetType.CallingCard, false);
20 TestContainsReferences(AssetType.Folder , false); 20 TestContainsReferences(AssetType.Folder , false);
21 TestContainsReferences(AssetType.Gesture , false); 21 TestContainsReferences(AssetType.Gesture , false);
22 TestContainsReferences(AssetType.ImageJPEG , false); 22 TestContainsReferences(AssetType.ImageJPEG , false);
23 TestContainsReferences(AssetType.ImageTGA , false); 23 TestContainsReferences(AssetType.ImageTGA , false);
24 TestContainsReferences(AssetType.Landmark , false); 24 TestContainsReferences(AssetType.Landmark , false);
25 TestContainsReferences(AssetType.LostAndFoundFolder, false); 25 TestContainsReferences(AssetType.LostAndFoundFolder, false);
26 TestContainsReferences(AssetType.LSLBytecode, false); 26 TestContainsReferences(AssetType.LSLBytecode, false);
27 TestContainsReferences(AssetType.LSLText, false); 27 TestContainsReferences(AssetType.LSLText, false);
28 TestContainsReferences(AssetType.Notecard, false); 28 TestContainsReferences(AssetType.Notecard, false);
29 TestContainsReferences(AssetType.Object, false); 29 TestContainsReferences(AssetType.Object, false);
30 TestContainsReferences(AssetType.RootFolder, false); 30 TestContainsReferences(AssetType.RootFolder, false);
31 TestContainsReferences(AssetType.Simstate, false); 31 TestContainsReferences(AssetType.Simstate, false);
32 TestContainsReferences(AssetType.SnapshotFolder, false); 32 TestContainsReferences(AssetType.SnapshotFolder, false);
33 TestContainsReferences(AssetType.Sound, false); 33 TestContainsReferences(AssetType.Sound, false);
34 TestContainsReferences(AssetType.SoundWAV, false); 34 TestContainsReferences(AssetType.SoundWAV, false);
35 TestContainsReferences(AssetType.Texture, false); 35 TestContainsReferences(AssetType.Texture, false);
36 TestContainsReferences(AssetType.TextureTGA, false); 36 TestContainsReferences(AssetType.TextureTGA, false);
37 TestContainsReferences(AssetType.TrashFolder, false); 37 TestContainsReferences(AssetType.TrashFolder, false);
38 TestContainsReferences(AssetType.Unknown, false); 38 TestContainsReferences(AssetType.Unknown, false);
39 } 39 }
40 40
41 private void TestContainsReferences(AssetType assetType, bool expected) 41 private void TestContainsReferences(AssetType assetType, bool expected)
42 { 42 {
43 AssetBase asset = new AssetBase(); 43 AssetBase asset = new AssetBase();
44 asset.Type = (sbyte)assetType; 44 asset.Type = (sbyte)assetType;
45 bool actual = asset.ContainsReferences; 45 bool actual = asset.ContainsReferences;
46 Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+"."); 46 Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+".");
47 } 47 }
48 } 48 }
49} 49}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
index 44bae5c..bb4696b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
@@ -1,48 +1,48 @@
1using System.Drawing; 1using System.Drawing;
2using OpenMetaverse; 2using OpenMetaverse;
3using OpenMetaverse.Imaging; 3using OpenMetaverse.Imaging;
4using OpenSim.Framework; 4using OpenSim.Framework;
5using OpenSim.Region.Framework.Scenes; 5using OpenSim.Region.Framework.Scenes;
6 6
7namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 7namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
8{ 8{
9 class Graphics : IGraphics 9 class Graphics : IGraphics
10 { 10 {
11 private readonly Scene m_scene; 11 private readonly Scene m_scene;
12 12
13 public Graphics(Scene m_scene) 13 public Graphics(Scene m_scene)
14 { 14 {
15 this.m_scene = m_scene; 15 this.m_scene = m_scene;
16 } 16 }
17 17
18 public UUID SaveBitmap(Bitmap data) 18 public UUID SaveBitmap(Bitmap data)
19 { 19 {
20 return SaveBitmap(data, false, true); 20 return SaveBitmap(data, false, true);
21 } 21 }
22 22
23 public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary) 23 public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary)
24 { 24 {
25 AssetBase asset = new AssetBase(); 25 AssetBase asset = new AssetBase();
26 asset.FullID = UUID.Random(); 26 asset.FullID = UUID.Random();
27 asset.Data = OpenJPEG.EncodeFromImage(data, lossless); 27 asset.Data = OpenJPEG.EncodeFromImage(data, lossless);
28 asset.Name = "MRMDynamicImage"; 28 asset.Name = "MRMDynamicImage";
29 asset.Type = 0; 29 asset.Type = 0;
30 asset.Description = "MRM Image"; 30 asset.Description = "MRM Image";
31 asset.Local = false; 31 asset.Local = false;
32 asset.Temporary = temporary; 32 asset.Temporary = temporary;
33 m_scene.CommsManager.AssetCache.AddAsset(asset); 33 m_scene.CommsManager.AssetCache.AddAsset(asset);
34 34
35 return asset.FullID; 35 return asset.FullID;
36 } 36 }
37 37
38 public Bitmap LoadBitmap(UUID assetID) 38 public Bitmap LoadBitmap(UUID assetID)
39 { 39 {
40 AssetBase bmp = m_scene.CommsManager.AssetCache.GetAsset(assetID, true); 40 AssetBase bmp = m_scene.CommsManager.AssetCache.GetAsset(assetID, true);
41 ManagedImage outimg; 41 ManagedImage outimg;
42 Image img; 42 Image img;
43 OpenJPEG.DecodeToImage(bmp.Data, out outimg, out img); 43 OpenJPEG.DecodeToImage(bmp.Data, out outimg, out img);
44 44
45 return new Bitmap(img); 45 return new Bitmap(img);
46 } 46 }
47 } 47 }
48} 48}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
index 92ef490..fef85dd 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 33namespace 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/Interfaces/IEntity.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs
index 94c53e3..0103a33 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs
@@ -1,14 +1,14 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenMetaverse; 4using OpenMetaverse;
5 5
6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
7{ 7{
8 public interface IEntity 8 public interface IEntity
9 { 9 {
10 string Name { get; set; } 10 string Name { get; set; }
11 UUID GlobalID { get; } 11 UUID GlobalID { get; }
12 Vector3 WorldPosition { get; set; } 12 Vector3 WorldPosition { get; set; }
13 } 13 }
14} 14}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs
index f4bc12e..7e5b804 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs
@@ -1,12 +1,12 @@
1using System.Drawing; 1using System.Drawing;
2using OpenMetaverse; 2using OpenMetaverse;
3 3
4namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 4namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
5{ 5{
6 public interface IGraphics 6 public interface IGraphics
7 { 7 {
8 UUID SaveBitmap(Bitmap data); 8 UUID SaveBitmap(Bitmap data);
9 UUID SaveBitmap(Bitmap data, bool lossless, bool temporary); 9 UUID SaveBitmap(Bitmap data, bool lossless, bool temporary);
10 Bitmap LoadBitmap(UUID assetID); 10 Bitmap LoadBitmap(UUID assetID);
11 } 11 }
12} 12}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs
index eea1baf..93cbc5b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31 31
32namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 32namespace 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/Interfaces/IHost.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHost.cs
index 8980b8f..6c76919 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using log4net; 31using log4net;
32 32
33namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 33namespace 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/Interfaces/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
index e17b716..dc2e3fa 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29using System.Drawing; 29using System.Drawing;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object; 31using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object;
32 32
33namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 33namespace 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/Interfaces/IObjectAccessor.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObjectAccessor.cs
index cd27a6a..7aed41b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 31namespace 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/Interfaces/IParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IParcel.cs
index 3b229a7..759b26d 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 33namespace 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/Interfaces/IPersistence.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IPersistence.cs
index bde51fe..17bb6e7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31 31
32namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 32namespace 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
index cf45de7..0be8473 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
@@ -1,43 +1,43 @@
1using System; 1using System;
2 2
3namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 3namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
4{ 4{
5 interface IScheduler 5 interface IScheduler
6 { 6 {
7 /// <summary> 7 /// <summary>
8 /// Schedule an event callback to occur 8 /// Schedule an event callback to occur
9 /// when 'time' is elapsed. 9 /// when 'time' is elapsed.
10 /// </summary> 10 /// </summary>
11 /// <param name="time">The period to wait before executing</param> 11 /// <param name="time">The period to wait before executing</param>
12 void RunIn(TimeSpan time); 12 void RunIn(TimeSpan time);
13 13
14 /// <summary> 14 /// <summary>
15 /// Schedule an event callback to fire 15 /// Schedule an event callback to fire
16 /// every "time". Equivilent to a repeating 16 /// every "time". Equivilent to a repeating
17 /// timer. 17 /// timer.
18 /// </summary> 18 /// </summary>
19 /// <param name="time">The period to wait between executions</param> 19 /// <param name="time">The period to wait between executions</param>
20 void RunAndRepeat(TimeSpan time); 20 void RunAndRepeat(TimeSpan time);
21 21
22 /// <summary> 22 /// <summary>
23 /// Fire this scheduler only when the region has 23 /// Fire this scheduler only when the region has
24 /// a user in it. 24 /// a user in it.
25 /// </summary> 25 /// </summary>
26 bool WhenRegionOccupied { get; set; } 26 bool WhenRegionOccupied { get; set; }
27 27
28 /// <summary> 28 /// <summary>
29 /// Fire this event only when the region is visible 29 /// Fire this event only when the region is visible
30 /// to a child agent, or there is a full agent 30 /// to a child agent, or there is a full agent
31 /// in this region. 31 /// in this region.
32 /// </summary> 32 /// </summary>
33 bool WhenRegionVisible { get; set; } 33 bool WhenRegionVisible { get; set; }
34 34
35 /// <summary> 35 /// <summary>
36 /// Determines whether this runs in the master scheduler thread, or a new thread 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 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 38 /// code does not execute perfectly on time, however will result in a lower
39 /// processor cost to running your code. 39 /// processor cost to running your code.
40 /// </summary> 40 /// </summary>
41 bool Schedule { get; set; } 41 bool Schedule { get; set; }
42 } 42 }
43} 43}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs
index cbac123..400367f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 33namespace 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/Interfaces/IWorld.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs
index 9196acd..acb569f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/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
28using System; 28using System;
29 29
30namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 30namespace 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 57d84e1..63fd31e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
@@ -1,88 +1,88 @@
1using System.Drawing; 1using System.Drawing;
2using OpenMetaverse; 2using OpenMetaverse;
3using OpenSim.Region.Framework.Scenes; 3using OpenSim.Region.Framework.Scenes;
4 4
5namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 5namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
6{ 6{
7 class SOPObjectMaterial : IObjectMaterial 7 class SOPObjectMaterial : IObjectMaterial
8 { 8 {
9 private readonly int m_face; 9 private readonly int m_face;
10 private readonly SceneObjectPart m_parent; 10 private readonly SceneObjectPart m_parent;
11 11
12 public SOPObjectMaterial(int m_face, SceneObjectPart m_parent) 12 public SOPObjectMaterial(int m_face, SceneObjectPart m_parent)
13 { 13 {
14 this.m_face = m_face; 14 this.m_face = m_face;
15 this.m_parent = m_parent; 15 this.m_parent = m_parent;
16 } 16 }
17 17
18 public Color Color 18 public Color Color
19 { 19 {
20 get 20 get
21 { 21 {
22 Color4 res = GetTexface().RGBA; 22 Color4 res = GetTexface().RGBA;
23 return Color.FromArgb((int) (res.A*255), (int) (res.R*255), (int) (res.G*255), (int) (res.B*255)); 23 return Color.FromArgb((int) (res.A*255), (int) (res.R*255), (int) (res.G*255), (int) (res.B*255));
24 } 24 }
25 set 25 set
26 { 26 {
27 Primitive.TextureEntry tex = m_parent.Shape.Textures; 27 Primitive.TextureEntry tex = m_parent.Shape.Textures;
28 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); 28 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
29 texface.RGBA = new Color4(value.R,value.G,value.B,value.A); 29 texface.RGBA = new Color4(value.R,value.G,value.B,value.A);
30 tex.FaceTextures[m_face] = texface; 30 tex.FaceTextures[m_face] = texface;
31 m_parent.UpdateTexture(tex); 31 m_parent.UpdateTexture(tex);
32 } 32 }
33 } 33 }
34 34
35 public UUID Texture 35 public UUID Texture
36 { 36 {
37 get 37 get
38 { 38 {
39 Primitive.TextureEntryFace texface = GetTexface(); 39 Primitive.TextureEntryFace texface = GetTexface();
40 return texface.TextureID; 40 return texface.TextureID;
41 } 41 }
42 set 42 set
43 { 43 {
44 Primitive.TextureEntry tex = m_parent.Shape.Textures; 44 Primitive.TextureEntry tex = m_parent.Shape.Textures;
45 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); 45 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
46 texface.TextureID = value; 46 texface.TextureID = value;
47 tex.FaceTextures[m_face] = texface; 47 tex.FaceTextures[m_face] = texface;
48 m_parent.UpdateTexture(tex); 48 m_parent.UpdateTexture(tex);
49 } 49 }
50 } 50 }
51 51
52 private Primitive.TextureEntryFace GetTexface() 52 private Primitive.TextureEntryFace GetTexface()
53 { 53 {
54 Primitive.TextureEntry tex = m_parent.Shape.Textures; 54 Primitive.TextureEntry tex = m_parent.Shape.Textures;
55 return tex.GetFace((uint)m_face); 55 return tex.GetFace((uint)m_face);
56 } 56 }
57 57
58 public TextureMapping Mapping 58 public TextureMapping Mapping
59 { 59 {
60 get { throw new System.NotImplementedException(); } 60 get { throw new System.NotImplementedException(); }
61 set { throw new System.NotImplementedException(); } 61 set { throw new System.NotImplementedException(); }
62 } 62 }
63 63
64 public bool Bright 64 public bool Bright
65 { 65 {
66 get { return GetTexface().Fullbright; } 66 get { return GetTexface().Fullbright; }
67 set { throw new System.NotImplementedException(); } 67 set { throw new System.NotImplementedException(); }
68 } 68 }
69 69
70 public double Bloom 70 public double Bloom
71 { 71 {
72 get { return GetTexface().Glow; } 72 get { return GetTexface().Glow; }
73 set { throw new System.NotImplementedException(); } 73 set { throw new System.NotImplementedException(); }
74 } 74 }
75 75
76 public bool Shiny 76 public bool Shiny
77 { 77 {
78 get { return GetTexface().Shiny != Shininess.None; } 78 get { return GetTexface().Shiny != Shininess.None; }
79 set { throw new System.NotImplementedException(); } 79 set { throw new System.NotImplementedException(); }
80 } 80 }
81 81
82 public bool BumpMap 82 public bool BumpMap
83 { 83 {
84 get { throw new System.NotImplementedException(); } 84 get { throw new System.NotImplementedException(); }
85 set { throw new System.NotImplementedException(); } 85 set { throw new System.NotImplementedException(); }
86 } 86 }
87 } 87 }
88} 88}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
index 755831c..1fb7715 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
@@ -1,64 +1,64 @@
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
28using OpenSim.Region.OptionalModules.Scripting.Minimodule; 28using OpenSim.Region.OptionalModules.Scripting.Minimodule;
29 29
30namespace OpenSim 30namespace OpenSim
31{ 31{
32 class DrunkenTextAppreciationModule : MRMBase 32 class DrunkenTextAppreciationModule : MRMBase
33 { 33 {
34 public override void Start() 34 public override void Start()
35 { 35 {
36 World.OnChat += World_OnChat; 36 World.OnChat += World_OnChat;
37 } 37 }
38 38
39 void World_OnChat(IWorld sender, ChatEventArgs e) 39 void World_OnChat(IWorld sender, ChatEventArgs e)
40 { 40 {
41 if (e.Sender is IAvatar) 41 if (e.Sender is IAvatar)
42 { 42 {
43 if (!e.Text.Contains("hic!")) 43 if (!e.Text.Contains("hic!"))
44 { 44 {
45 e.Text = e.Text.Replace("s", "sh"); 45 e.Text = e.Text.Replace("s", "sh");
46 e.Text = e.Text.Replace("S", "Sh"); 46 e.Text = e.Text.Replace("S", "Sh");
47 e.Text += " ...hic!"; 47 e.Text += " ...hic!";
48 48
49 Host.Object.Say(e.Text); 49 Host.Object.Say(e.Text);
50 } 50 }
51 } 51 }
52 52
53 if(e.Sender is IObject) 53 if(e.Sender is IObject)
54 { 54 {
55 // Ignore 55 // Ignore
56 } 56 }
57 } 57 }
58 58
59 public override void Stop() 59 public override void Stop()
60 { 60 {
61 61
62 } 62 }
63 } 63 }
64} \ No newline at end of file 64} \ No newline at end of file
diff --git a/OpenSim/Tests/Common/DatabaseTestAttribute.cs b/OpenSim/Tests/Common/DatabaseTestAttribute.cs
index 9d21831..efae887 100644
--- a/OpenSim/Tests/Common/DatabaseTestAttribute.cs
+++ b/OpenSim/Tests/Common/DatabaseTestAttribute.cs
@@ -1,17 +1,17 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using NUnit.Framework; 4using NUnit.Framework;
5 5
6namespace OpenSim.Tests.Common 6namespace OpenSim.Tests.Common
7{ 7{
8 [AttributeUsage(AttributeTargets.All, 8 [AttributeUsage(AttributeTargets.All,
9 AllowMultiple=false, 9 AllowMultiple=false,
10 Inherited=true)] 10 Inherited=true)]
11 public class DatabaseTestAttribute : LongRunningAttribute 11 public class DatabaseTestAttribute : LongRunningAttribute
12 { 12 {
13 public DatabaseTestAttribute() : base("Database") 13 public DatabaseTestAttribute() : base("Database")
14 { 14 {
15 } 15 }
16 } 16 }
17} \ No newline at end of file 17} \ No newline at end of file
diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs
index b1dabfc..9042a73 100644
--- a/OpenSim/Tests/Common/LongRunningAttribute.cs
+++ b/OpenSim/Tests/Common/LongRunningAttribute.cs
@@ -1,22 +1,22 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using NUnit.Framework; 4using NUnit.Framework;
5 5
6namespace OpenSim.Tests.Common 6namespace OpenSim.Tests.Common
7{ 7{
8 [AttributeUsage(AttributeTargets.All, 8 [AttributeUsage(AttributeTargets.All,
9 AllowMultiple = false, 9 AllowMultiple = false,
10 Inherited = true)] 10 Inherited = true)]
11 public class LongRunningAttribute : CategoryAttribute 11 public class LongRunningAttribute : CategoryAttribute
12 { 12 {
13 public LongRunningAttribute() : this("Long Running Test") 13 public LongRunningAttribute() : this("Long Running Test")
14 { 14 {
15 15
16 } 16 }
17 17
18 protected LongRunningAttribute(string category) : base(category) 18 protected LongRunningAttribute(string category) : base(category)
19 { 19 {
20 } 20 }
21 } 21 }
22} 22}
generated by cgit v1.1 at 2024-11-06 10:15:31 +0000