diff options
author | Adam Frisby | 2009-04-01 05:58:07 +0000 |
---|---|---|
committer | Adam Frisby | 2009-04-01 05:58:07 +0000 |
commit | 5225e40f9e2cfdbc5a14099f45e794ed208838f5 (patch) | |
tree | 5669e6208ca03c860082ac7c08fc82923c473f49 /OpenSim/Region/OptionalModules/Scripting | |
parent | Finally clean up the Scene.Permissions and permissions module. (diff) | |
download | opensim-SC-5225e40f9e2cfdbc5a14099f45e794ed208838f5.zip opensim-SC-5225e40f9e2cfdbc5a14099f45e794ed208838f5.tar.gz opensim-SC-5225e40f9e2cfdbc5a14099f45e794ed208838f5.tar.bz2 opensim-SC-5225e40f9e2cfdbc5a14099f45e794ed208838f5.tar.xz |
* Removes some hard-coded magic numbers relating to RegionSize. We now use Constants.RegionSize as expected. (Working towards enlarged or smaller regionsizes that arent multiples of 256m)
* Adds minor functionality to MRM Scripting.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 51 |
2 files changed, 28 insertions, 29 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs index 1ccc8a4..c7f9569 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs | |||
@@ -1,4 +1,4 @@ | |||
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 | * |
@@ -37,6 +37,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
37 | uint LocalID { get; } | 37 | uint LocalID { get; } |
38 | UUID GlobalID { get; } | 38 | UUID GlobalID { get; } |
39 | 39 | ||
40 | String Name { get; set; } | ||
41 | String Description { get; set; } | ||
42 | |||
40 | IObject[] Children { get; } | 43 | IObject[] Children { get; } |
41 | 44 | ||
42 | /// <summary> | 45 | /// <summary> |
@@ -48,6 +51,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
48 | 51 | ||
49 | Vector3 Scale { get; set; } | 52 | Vector3 Scale { get; set; } |
50 | Quaternion Rotation { get; set; } | 53 | Quaternion Rotation { get; set; } |
54 | Vector3 Position { get; set; } | ||
51 | 55 | ||
52 | Vector3 SitTarget { get; set; } | 56 | Vector3 SitTarget { get; set; } |
53 | String SitTargetText { get; set; } | 57 | String SitTargetText { get; set; } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index e1b9f3e..538a496 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -1,31 +1,4 @@ | |||
1 | /* | 1 | using System.Collections.Generic; |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System.Collections.Generic; | ||
29 | using OpenMetaverse; | 2 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 3 | using OpenSim.Framework; |
31 | using OpenSim.Region.Framework.Scenes; | 4 | using OpenSim.Region.Framework.Scenes; |
@@ -71,6 +44,18 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
71 | get { return GetSOP().UUID; } | 44 | get { return GetSOP().UUID; } |
72 | } | 45 | } |
73 | 46 | ||
47 | public string Name | ||
48 | { | ||
49 | get { return GetSOP().Name; } | ||
50 | set { GetSOP().Name = value; } | ||
51 | } | ||
52 | |||
53 | public string Description | ||
54 | { | ||
55 | get { return GetSOP().Description; } | ||
56 | set { GetSOP().Description = value; } | ||
57 | } | ||
58 | |||
74 | public IObject[] Children | 59 | public IObject[] Children |
75 | { | 60 | { |
76 | get | 61 | get |
@@ -123,6 +108,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
123 | set { throw new System.NotImplementedException(); } | 108 | set { throw new System.NotImplementedException(); } |
124 | } | 109 | } |
125 | 110 | ||
111 | public Vector3 Position | ||
112 | { | ||
113 | get { return GetSOP().AbsolutePosition; } | ||
114 | set | ||
115 | { | ||
116 | SceneObjectPart pos = GetSOP(); | ||
117 | pos.UpdateOffSet(value - pos.AbsolutePosition); | ||
118 | } | ||
119 | } | ||
120 | |||
126 | public Vector3 SitTarget | 121 | public Vector3 SitTarget |
127 | { | 122 | { |
128 | get { throw new System.NotImplementedException(); } | 123 | get { throw new System.NotImplementedException(); } |