From 2239ecba188b0435d9a6d58b1c66f2b6eb591116 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 8 Jun 2007 19:10:55 +0000
Subject: *Merged EstateManager, EstateSettings, ParcelManager,Parcel, and
 ParcelData classes *Incorporated EstateSettings into the RegionInfo class
 *Next step is to load from db, save to db the parcel and estate settings

---
 .../OpenSim.Scripting.EmbeddedJVM.csproj           | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj')

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index bd1a332..6ffcf9e 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -76,66 +76,66 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClassInstance.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClassRecord.cs">
+    <Compile Include="MainMemory.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Heap.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interpreter.cs">
+    <Compile Include="StackFrame.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="InterpreterLogic.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InterpreterMethods.cs">
+    <Compile Include="OpenSimJVM.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InterpreterReturn.cs">
+    <Compile Include="InterpreterMethods.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MainMemory.cs">
+    <Compile Include="ClassInstance.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MethodMemory.cs">
+    <Compile Include="InterpreterReturn.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Object.cs">
+    <Compile Include="Interpreter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimJVM.cs">
+    <Compile Include="ClassRecord.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Stack.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="StackFrame.cs">
+    <Compile Include="Object.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Thread.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="MethodMemory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ArrayReference.cs">
+    <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\BaseType.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ObjectReference.cs">
+    <Compile Include="Types\ArrayReference.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+    <Compile Include="Types\ObjectReference.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\PrimitiveTypes\Char.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\PrimitiveTypes\Float.cs">
       <SubType>Code</SubType>
     </Compile>
-- 
cgit v1.1