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.dll.build          | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build')

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>
-- 
cgit v1.1