aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Scripting
diff options
context:
space:
mode:
authormingchen2007-06-11 17:58:14 +0000
committermingchen2007-06-11 17:58:14 +0000
commit304ebe22a24f16e9fa41925ab9cdbd4bffdfd880 (patch)
tree72efd2a81106c228c611c19c2b3e795b03e04831 /OpenSim/OpenSim.Scripting
parent*Removed AdminWebFront -- Unused (diff)
downloadopensim-SC_OLD-304ebe22a24f16e9fa41925ab9cdbd4bffdfd880.zip
opensim-SC_OLD-304ebe22a24f16e9fa41925ab9cdbd4bffdfd880.tar.gz
opensim-SC_OLD-304ebe22a24f16e9fa41925ab9cdbd4bffdfd880.tar.bz2
opensim-SC_OLD-304ebe22a24f16e9fa41925ab9cdbd4bffdfd880.tar.xz
*Removed OSVector3 and replaced with libsecondlife.LLVector3
Diffstat (limited to 'OpenSim/OpenSim.Scripting')
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs8
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj35
2 files changed, 28 insertions, 15 deletions
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;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36 36
37using libsecondlife;
38
37namespace OpenSim.Scripting.EmbeddedJVM 39namespace OpenSim.Scripting.EmbeddedJVM
38{ 40{
39 partial class Thread 41 partial class Thread
@@ -101,7 +103,7 @@ namespace OpenSim.Scripting.EmbeddedJVM
101 { 103 {
102 //Console.WriteLine("get entity pos for " + ((Int)bs1).mValue); 104 //Console.WriteLine("get entity pos for " + ((Int)bs1).mValue);
103 //should get the position of the entity from the IScriptAPI 105 //should get the position of the entity from the IScriptAPI
104 OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); 106 LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);
105 Float pos = new Float(); 107 Float pos = new Float();
106 pos.mValue = vec3.X; 108 pos.mValue = vec3.X;
107 // Console.WriteLine("returned x value " + vec3.X.ToString()); 109 // Console.WriteLine("returned x value " + vec3.X.ToString());
@@ -114,7 +116,7 @@ namespace OpenSim.Scripting.EmbeddedJVM
114 if (bs1 is Int) 116 if (bs1 is Int)
115 { 117 {
116 //should get the position of the entity from the IScriptAPI 118 //should get the position of the entity from the IScriptAPI
117 OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); 119 LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);
118 Float pos = new Float(); 120 Float pos = new Float();
119 pos.mValue = vec3.Y; 121 pos.mValue = vec3.Y;
120 this._mThread.currentFrame.OpStack.Push(pos); 122 this._mThread.currentFrame.OpStack.Push(pos);
@@ -126,7 +128,7 @@ namespace OpenSim.Scripting.EmbeddedJVM
126 if (bs1 is Int) 128 if (bs1 is Int)
127 { 129 {
128 //should get the position of the entity from the IScriptAPI 130 //should get the position of the entity from the IScriptAPI
129 OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); 131 LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);
130 Float pos = new Float(); 132 Float pos = new Float();
131 pos.mValue = vec3.Z; 133 pos.mValue = vec3.Z;
132 this._mThread.currentFrame.OpStack.Push(pos); 134 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 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{97A82740-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{97A82740-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName> 13 <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Scripting.EmbeddedJVM</RootNamespace> 21 <RootNamespace>OpenSim.Scripting.EmbeddedJVM</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,14 +61,19 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
69 <SpecificVersion>False</SpecificVersion>
70 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
71 </Reference>
72 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 74 <Private>False</Private>
64 </Reference> 75 </Reference>
65 <Reference Include="System.Xml" > 76 <Reference Include="System.Xml">
66 <HintPath>System.Xml.dll</HintPath> 77 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private> 78 <Private>False</Private>
68 </Reference> 79 </Reference>
@@ -72,7 +83,7 @@
72 <Name>OpenSim.Framework</Name> 83 <Name>OpenSim.Framework</Name>
73 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 84 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
74 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 85 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
75 <Private>False</Private> 86 <Private>False</Private>
76 </ProjectReference> 87 </ProjectReference>
77 </ItemGroup> 88 </ItemGroup>
78 <ItemGroup> 89 <ItemGroup>
@@ -150,4 +161,4 @@
150 <PostBuildEvent> 161 <PostBuildEvent>
151 </PostBuildEvent> 162 </PostBuildEvent>
152 </PropertyGroup> 163 </PropertyGroup>
153</Project> 164</Project> \ No newline at end of file
generated by cgit v1.1 at 2024-11-20 14:51:49 +0000