*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

3 files changed, 27 insertions, 27 deletions

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>

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>

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

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

-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath>

+    <ReferencePath>C:\sugilite\bin\</ReferencePath>

     <LastOpenVersion>8.0.50727</LastOpenVersion>

     <ProjectView>ProjectFiles</ProjectView>

     <ProjectTrust>0</ProjectTrust>

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index c5255db..ac4d564 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="ClassInstance.cs" />

-                <include name="ClassRecord.cs" />

+                <include name="MainMemory.cs" />

                 <include name="Heap.cs" />

-                <include name="Interpreter.cs" />

+                <include name="StackFrame.cs" />

                 <include name="InterpreterLogic.cs" />

+                <include name="OpenSimJVM.cs" />

                 <include name="InterpreterMethods.cs" />

+                <include name="ClassInstance.cs" />

                 <include name="InterpreterReturn.cs" />

-                <include name="MainMemory.cs" />

-                <include name="MethodMemory.cs" />

-                <include name="Object.cs" />

-                <include name="OpenSimJVM.cs" />

+                <include name="Interpreter.cs" />

+                <include name="ClassRecord.cs" />

                 <include name="Stack.cs" />

-                <include name="StackFrame.cs" />

+                <include name="Object.cs" />

                 <include name="Thread.cs" />

+                <include name="MethodMemory.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

-                <include name="Types/ArrayReference.cs" />

                 <include name="Types/BaseType.cs" />

+                <include name="Types/ArrayReference.cs" />

                 <include name="Types/ObjectReference.cs" />

-                <include name="Types/PrimitiveTypes/Byte.cs" />

                 <include name="Types/PrimitiveTypes/Char.cs" />

+                <include name="Types/PrimitiveTypes/Byte.cs" />

                 <include name="Types/PrimitiveTypes/Float.cs" />

                 <include name="Types/PrimitiveTypes/Int.cs" />

             </sources>