diff options
author | mingchen | 2007-06-08 19:10:55 +0000 |
---|---|---|
committer | mingchen | 2007-06-08 19:10:55 +0000 |
commit | 2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch) | |
tree | bd07f5ddd43dc11077dc445d7b50a983ed37535f /OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj | |
parent | *Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types (diff) | |
download | opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.zip opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.gz opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj | 32 | ||||
-rw-r--r-- | OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user | 2 |
2 files changed, 17 insertions, 17 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> |