diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Scenes/Scripting | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | 19 |
2 files changed, 14 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs index dbe2516..152825f 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | |||
@@ -25,8 +25,7 @@ | |||
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 Axiom.Math; | 28 | using OpenMetaverse; |
29 | using libsecondlife; | ||
30 | 29 | ||
31 | namespace OpenSim.Region.Environment.Scenes.Scripting | 30 | namespace OpenSim.Region.Environment.Scenes.Scripting |
32 | { | 31 | { |
@@ -35,10 +34,10 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
35 | string Name { get; set; } | 34 | string Name { get; set; } |
36 | string Description { get; set; } | 35 | string Description { get; set; } |
37 | 36 | ||
38 | LLUUID UUID { get; } | 37 | UUID UUID { get; } |
39 | LLUUID ObjectOwner { get; } | 38 | UUID ObjectOwner { get; } |
40 | LLUUID ObjectCreator { get; } | 39 | UUID ObjectCreator { get; } |
41 | LLVector3 AbsolutePosition { get; } | 40 | Vector3 AbsolutePosition { get; } |
42 | 41 | ||
43 | string SitName { get; set; } | 42 | string SitName { get; set; } |
44 | string TouchName { get; set; } | 43 | string TouchName { get; set; } |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index 4b1b56a..37f5d43 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | |||
@@ -26,14 +26,13 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using Axiom.Math; | 29 | using OpenMetaverse; |
30 | using libsecondlife; | ||
31 | 30 | ||
32 | namespace OpenSim.Region.Environment.Scenes.Scripting | 31 | namespace OpenSim.Region.Environment.Scenes.Scripting |
33 | { | 32 | { |
34 | public class NullScriptHost : IScriptHost | 33 | public class NullScriptHost : IScriptHost |
35 | { | 34 | { |
36 | private LLVector3 m_pos = new LLVector3(128, 128, 30); | 35 | private Vector3 m_pos = new Vector3(128, 128, 30); |
37 | 36 | ||
38 | public string Name | 37 | public string Name |
39 | { | 38 | { |
@@ -59,22 +58,22 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
59 | set { } | 58 | set { } |
60 | } | 59 | } |
61 | 60 | ||
62 | public LLUUID UUID | 61 | public UUID UUID |
63 | { | 62 | { |
64 | get { return LLUUID.Zero; } | 63 | get { return UUID.Zero; } |
65 | } | 64 | } |
66 | 65 | ||
67 | public LLUUID ObjectOwner | 66 | public UUID ObjectOwner |
68 | { | 67 | { |
69 | get { return LLUUID.Zero; } | 68 | get { return UUID.Zero; } |
70 | } | 69 | } |
71 | 70 | ||
72 | public LLUUID ObjectCreator | 71 | public UUID ObjectCreator |
73 | { | 72 | { |
74 | get { return LLUUID.Zero; } | 73 | get { return UUID.Zero; } |
75 | } | 74 | } |
76 | 75 | ||
77 | public LLVector3 AbsolutePosition | 76 | public Vector3 AbsolutePosition |
78 | { | 77 | { |
79 | get { return m_pos; } | 78 | get { return m_pos; } |
80 | } | 79 | } |