*Removed OSVector3 and replaced with libsecondlife.LLVector3

3 files changed, 30 insertions, 17 deletions

diff --git a/OpenSim/OpenSim.Region/World/World.Scripting.cs b/OpenSim/OpenSim.Region/World/World.Scripting.cs
index 4cd3306..e4b5d02 100644
--- a/OpenSim/OpenSim.Region/World/World.Scripting.cs
+++ b/OpenSim/OpenSim.Region/World/World.Scripting.cs
@@ -118,9 +118,9 @@ namespace OpenSim.Region
         /// </summary>

         /// <param name="localID"></param>

         /// <returns></returns>

-        public OSVector3 GetEntityPosition(uint localID)

+        public LLVector3 GetEntityPosition(uint localID)

         {

-            OSVector3 res = new OSVector3();

+            LLVector3 res = new LLVector3();

            // Console.WriteLine("script-  getting entity " + localID + " position");

             foreach (Entity entity in this.Entities.Values)

             {

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index 00aa98e..4760e59 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
@@ -34,6 +34,8 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework;

 using OpenSim.Framework.Types;

 

+using libsecondlife;

+

 namespace OpenSim.Scripting.EmbeddedJVM

 {

     partial class Thread

@@ -101,7 +103,7 @@ namespace OpenSim.Scripting.EmbeddedJVM
                                             {

                                                 //Console.WriteLine("get entity pos for " + ((Int)bs1).mValue);

                                                 //should get the position of the entity from the IScriptAPI

-                                                OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);

+                                                LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);

                                                 Float pos = new Float();

                                                 pos.mValue = vec3.X;

                                                // Console.WriteLine("returned x value " + vec3.X.ToString());

@@ -114,7 +116,7 @@ namespace OpenSim.Scripting.EmbeddedJVM
                                             if (bs1 is Int)

                                             {

                                                 //should get the position of the entity from the IScriptAPI

-                                                OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);

+                                                LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);

                                                 Float pos = new Float();

                                                 pos.mValue = vec3.Y;

                                                 this._mThread.currentFrame.OpStack.Push(pos);

@@ -126,7 +128,7 @@ namespace OpenSim.Scripting.EmbeddedJVM
                                             if (bs1 is Int)

                                             {

                                                 //should get the position of the entity from the IScriptAPI

-                                                OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);

+                                                LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);

                                                 Float pos = new Float();

                                                 pos.mValue = vec3.Z;

                                                 this._mThread.currentFrame.OpStack.Push(pos);

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index bd1a332..0750742 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{97A82740-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Scripting.EmbeddedJVM</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,14 +61,19 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

+    </Reference>

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -72,7 +83,7 @@
       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -150,4 +161,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file