diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs (renamed from OpenSim.Scripting.EmbeddedJVM/ClassInstance.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs (renamed from OpenSim.Scripting.EmbeddedJVM/ClassRecord.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Heap.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Heap.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Interpreter.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Interpreter.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs (renamed from OpenSim.Scripting.EmbeddedJVM/InterpreterLogic.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs (renamed from OpenSim.Scripting.EmbeddedJVM/InterpreterMethods.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs (renamed from OpenSim.Scripting.EmbeddedJVM/InterpreterReturn.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/MainMemory.cs (renamed from OpenSim.Scripting.EmbeddedJVM/MainMemory.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs (renamed from OpenSim.Scripting.EmbeddedJVM/MethodMemory.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Object.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Object.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj (renamed from OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj) | 6 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user (renamed from OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user) | 2 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build (renamed from OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build) | 8 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs (renamed from OpenSim.Scripting.EmbeddedJVM/OpenSimJVM.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Stack.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Stack.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/StackFrame.cs (renamed from OpenSim.Scripting.EmbeddedJVM/StackFrame.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Thread.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Thread.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Types/ArrayReference.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Types/BaseType.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Types/ObjectReference.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Byte.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Char.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Float.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs (renamed from OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Int.cs) | 0 |
25 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim.Scripting.EmbeddedJVM/ClassInstance.cs b/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs index 15ef814..15ef814 100644 --- a/OpenSim.Scripting.EmbeddedJVM/ClassInstance.cs +++ b/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/ClassRecord.cs b/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs index 15d8a4b..15d8a4b 100644 --- a/OpenSim.Scripting.EmbeddedJVM/ClassRecord.cs +++ b/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Heap.cs b/OpenSim.Scripting/EmbeddedJVM/Heap.cs index 138e85e..138e85e 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Heap.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Heap.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Interpreter.cs b/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs index b94248c..b94248c 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Interpreter.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/InterpreterLogic.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs index 3b7da35..3b7da35 100644 --- a/OpenSim.Scripting.EmbeddedJVM/InterpreterLogic.cs +++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/InterpreterMethods.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs index dc3402e..dc3402e 100644 --- a/OpenSim.Scripting.EmbeddedJVM/InterpreterMethods.cs +++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/InterpreterReturn.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs index 6704e31..6704e31 100644 --- a/OpenSim.Scripting.EmbeddedJVM/InterpreterReturn.cs +++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/MainMemory.cs b/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs index ff18f90..ff18f90 100644 --- a/OpenSim.Scripting.EmbeddedJVM/MainMemory.cs +++ b/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/MethodMemory.cs b/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs index 2541991..2541991 100644 --- a/OpenSim.Scripting.EmbeddedJVM/MethodMemory.cs +++ b/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Object.cs b/OpenSim.Scripting/EmbeddedJVM/Object.cs index e6e392c..e6e392c 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Object.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Object.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index 90aeff8..a1e95f4 100644 --- a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\ScriptEngines\</OutputPath> | 35 | <OutputPath>..\..\bin\ScriptEngines\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\ScriptEngines\</OutputPath> | 53 | <OutputPath>..\..\bin\ScriptEngines\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -68,7 +68,7 @@ | |||
68 | </Reference> | 68 | </Reference> |
69 | </ItemGroup> | 69 | </ItemGroup> |
70 | <ItemGroup> | 70 | <ItemGroup> |
71 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 71 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> |
72 | <Name>OpenSim.Framework</Name> | 72 | <Name>OpenSim.Framework</Name> |
73 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 73 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user index ea58087..e1615f7 100644 --- a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user +++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user | |||
@@ -2,7 +2,7 @@ | |||
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
5 | <ReferencePath>C:\Documents and Settings\Stefan\My Documents\source\opensim\trunk\bin\</ReferencePath> | 5 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim11-04trunk\bin\</ReferencePath> |
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | 6 | <LastOpenVersion>8.0.50727</LastOpenVersion> |
7 | <ProjectView>ProjectFiles</ProjectView> | 7 | <ProjectView>ProjectFiles</ProjectView> |
8 | <ProjectTrust>0</ProjectTrust> | 8 | <ProjectTrust>0</ProjectTrust> |
diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index 46067c1..ae79c83 100644 --- a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build | |||
@@ -41,12 +41,12 @@ | |||
41 | </lib> | 41 | </lib> |
42 | <include name="System.dll" /> | 42 | <include name="System.dll" /> |
43 | <include name="System.Xml.dll" /> | 43 | <include name="System.Xml.dll" /> |
44 | <include name="../bin/OpenSim.Framework.dll" /> | 44 | <include name="../../bin/OpenSim.Framework.dll" /> |
45 | </references> | 45 | </references> |
46 | </csc> | 46 | </csc> |
47 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/ScriptEngines/" /> | 47 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/ScriptEngines/" /> |
48 | <mkdir dir="${project::get-base-directory()}/../bin/ScriptEngines/"/> | 48 | <mkdir dir="${project::get-base-directory()}/../../bin/ScriptEngines/"/> |
49 | <copy todir="${project::get-base-directory()}/../bin/ScriptEngines/"> | 49 | <copy todir="${project::get-base-directory()}/../../bin/ScriptEngines/"> |
50 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 50 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
51 | <include name="*.dll"/> | 51 | <include name="*.dll"/> |
52 | <include name="*.exe"/> | 52 | <include name="*.exe"/> |
diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSimJVM.cs b/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs index b47bb50..b47bb50 100644 --- a/OpenSim.Scripting.EmbeddedJVM/OpenSimJVM.cs +++ b/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Properties/AssemblyInfo.cs b/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs index 53a0f08..53a0f08 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Properties/AssemblyInfo.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Stack.cs b/OpenSim.Scripting/EmbeddedJVM/Stack.cs index d77d82e..d77d82e 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Stack.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Stack.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/StackFrame.cs b/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs index afca7a9..afca7a9 100644 --- a/OpenSim.Scripting.EmbeddedJVM/StackFrame.cs +++ b/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Thread.cs b/OpenSim.Scripting/EmbeddedJVM/Thread.cs index 436949c..436949c 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Thread.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Thread.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/ArrayReference.cs b/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs index 2854eab..2854eab 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Types/ArrayReference.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/BaseType.cs b/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs index 270aa7b..270aa7b 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Types/BaseType.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/ObjectReference.cs b/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs index da28eaa..da28eaa 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Types/ObjectReference.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Byte.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs index 1a3ecff..1a3ecff 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Byte.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Char.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs index 19002d4..19002d4 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Char.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Float.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs index 91f1679..91f1679 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Float.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs | |||
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Int.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs index 4ecd325..4ecd325 100644 --- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Int.cs +++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs | |||