aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Scripting
diff options
context:
space:
mode:
authormingchen2007-06-08 19:10:55 +0000
committermingchen2007-06-08 19:10:55 +0000
commit2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch)
treebd07f5ddd43dc11077dc445d7b50a983ed37535f /OpenSim/OpenSim.Scripting
parent*Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types (diff)
downloadopensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.zip
opensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.gz
opensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.bz2
opensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.xz
*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
Diffstat (limited to 'OpenSim/OpenSim.Scripting')
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj32
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user2
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build20
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 @@
76 </ProjectReference> 76 </ProjectReference>
77 </ItemGroup> 77 </ItemGroup>
78 <ItemGroup> 78 <ItemGroup>
79 <Compile Include="ClassInstance.cs"> 79 <Compile Include="MainMemory.cs">
80 <SubType>Code</SubType>
81 </Compile>
82 <Compile Include="ClassRecord.cs">
83 <SubType>Code</SubType> 80 <SubType>Code</SubType>
84 </Compile> 81 </Compile>
85 <Compile Include="Heap.cs"> 82 <Compile Include="Heap.cs">
86 <SubType>Code</SubType> 83 <SubType>Code</SubType>
87 </Compile> 84 </Compile>
88 <Compile Include="Interpreter.cs"> 85 <Compile Include="StackFrame.cs">
89 <SubType>Code</SubType> 86 <SubType>Code</SubType>
90 </Compile> 87 </Compile>
91 <Compile Include="InterpreterLogic.cs"> 88 <Compile Include="InterpreterLogic.cs">
92 <SubType>Code</SubType> 89 <SubType>Code</SubType>
93 </Compile> 90 </Compile>
94 <Compile Include="InterpreterMethods.cs"> 91 <Compile Include="OpenSimJVM.cs">
95 <SubType>Code</SubType> 92 <SubType>Code</SubType>
96 </Compile> 93 </Compile>
97 <Compile Include="InterpreterReturn.cs"> 94 <Compile Include="InterpreterMethods.cs">
98 <SubType>Code</SubType> 95 <SubType>Code</SubType>
99 </Compile> 96 </Compile>
100 <Compile Include="MainMemory.cs"> 97 <Compile Include="ClassInstance.cs">
101 <SubType>Code</SubType> 98 <SubType>Code</SubType>
102 </Compile> 99 </Compile>
103 <Compile Include="MethodMemory.cs"> 100 <Compile Include="InterpreterReturn.cs">
104 <SubType>Code</SubType> 101 <SubType>Code</SubType>
105 </Compile> 102 </Compile>
106 <Compile Include="Object.cs"> 103 <Compile Include="Interpreter.cs">
107 <SubType>Code</SubType> 104 <SubType>Code</SubType>
108 </Compile> 105 </Compile>
109 <Compile Include="OpenSimJVM.cs"> 106 <Compile Include="ClassRecord.cs">
110 <SubType>Code</SubType> 107 <SubType>Code</SubType>
111 </Compile> 108 </Compile>
112 <Compile Include="Stack.cs"> 109 <Compile Include="Stack.cs">
113 <SubType>Code</SubType> 110 <SubType>Code</SubType>
114 </Compile> 111 </Compile>
115 <Compile Include="StackFrame.cs"> 112 <Compile Include="Object.cs">
116 <SubType>Code</SubType> 113 <SubType>Code</SubType>
117 </Compile> 114 </Compile>
118 <Compile Include="Thread.cs"> 115 <Compile Include="Thread.cs">
119 <SubType>Code</SubType> 116 <SubType>Code</SubType>
120 </Compile> 117 </Compile>
121 <Compile Include="Properties\AssemblyInfo.cs"> 118 <Compile Include="MethodMemory.cs">
122 <SubType>Code</SubType> 119 <SubType>Code</SubType>
123 </Compile> 120 </Compile>
124 <Compile Include="Types\ArrayReference.cs"> 121 <Compile Include="Properties\AssemblyInfo.cs">
125 <SubType>Code</SubType> 122 <SubType>Code</SubType>
126 </Compile> 123 </Compile>
127 <Compile Include="Types\BaseType.cs"> 124 <Compile Include="Types\BaseType.cs">
128 <SubType>Code</SubType> 125 <SubType>Code</SubType>
129 </Compile> 126 </Compile>
130 <Compile Include="Types\ObjectReference.cs"> 127 <Compile Include="Types\ArrayReference.cs">
131 <SubType>Code</SubType> 128 <SubType>Code</SubType>
132 </Compile> 129 </Compile>
133 <Compile Include="Types\PrimitiveTypes\Byte.cs"> 130 <Compile Include="Types\ObjectReference.cs">
134 <SubType>Code</SubType> 131 <SubType>Code</SubType>
135 </Compile> 132 </Compile>
136 <Compile Include="Types\PrimitiveTypes\Char.cs"> 133 <Compile Include="Types\PrimitiveTypes\Char.cs">
137 <SubType>Code</SubType> 134 <SubType>Code</SubType>
138 </Compile> 135 </Compile>
136 <Compile Include="Types\PrimitiveTypes\Byte.cs">
137 <SubType>Code</SubType>
138 </Compile>
139 <Compile Include="Types\PrimitiveTypes\Float.cs"> 139 <Compile Include="Types\PrimitiveTypes\Float.cs">
140 <SubType>Code</SubType> 140 <SubType>Code</SubType>
141 </Compile> 141 </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 @@
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:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\sugilite\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/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 @@
11 <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > 11 <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ClassInstance.cs" /> 14 <include name="MainMemory.cs" />
15 <include name="ClassRecord.cs" />
16 <include name="Heap.cs" /> 15 <include name="Heap.cs" />
17 <include name="Interpreter.cs" /> 16 <include name="StackFrame.cs" />
18 <include name="InterpreterLogic.cs" /> 17 <include name="InterpreterLogic.cs" />
18 <include name="OpenSimJVM.cs" />
19 <include name="InterpreterMethods.cs" /> 19 <include name="InterpreterMethods.cs" />
20 <include name="ClassInstance.cs" />
20 <include name="InterpreterReturn.cs" /> 21 <include name="InterpreterReturn.cs" />
21 <include name="MainMemory.cs" /> 22 <include name="Interpreter.cs" />
22 <include name="MethodMemory.cs" /> 23 <include name="ClassRecord.cs" />
23 <include name="Object.cs" />
24 <include name="OpenSimJVM.cs" />
25 <include name="Stack.cs" /> 24 <include name="Stack.cs" />
26 <include name="StackFrame.cs" /> 25 <include name="Object.cs" />
27 <include name="Thread.cs" /> 26 <include name="Thread.cs" />
27 <include name="MethodMemory.cs" />
28 <include name="Properties/AssemblyInfo.cs" /> 28 <include name="Properties/AssemblyInfo.cs" />
29 <include name="Types/ArrayReference.cs" />
30 <include name="Types/BaseType.cs" /> 29 <include name="Types/BaseType.cs" />
30 <include name="Types/ArrayReference.cs" />
31 <include name="Types/ObjectReference.cs" /> 31 <include name="Types/ObjectReference.cs" />
32 <include name="Types/PrimitiveTypes/Byte.cs" />
33 <include name="Types/PrimitiveTypes/Char.cs" /> 32 <include name="Types/PrimitiveTypes/Char.cs" />
33 <include name="Types/PrimitiveTypes/Byte.cs" />
34 <include name="Types/PrimitiveTypes/Float.cs" /> 34 <include name="Types/PrimitiveTypes/Float.cs" />
35 <include name="Types/PrimitiveTypes/Int.cs" /> 35 <include name="Types/PrimitiveTypes/Int.cs" />
36 </sources> 36 </sources>