aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj20
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build14
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Update.cs (renamed from OpenSim/OpenSim.Region/World/Avatar.Update.cs)0
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.cs (renamed from OpenSim/OpenSim.Region/World/Avatar.cs)0
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs (renamed from OpenSim/OpenSim.Region/World/AvatarAnimations.cs)0
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/Entity.cs (renamed from OpenSim/OpenSim.Region/World/Entity.cs)0
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/Primitive.cs (renamed from OpenSim/OpenSim.Region/World/Primitive.cs)0
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/SceneObject.cs (renamed from OpenSim/OpenSim.Region/World/SceneObject.cs)0
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj8
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build4
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj6
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build2
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj10
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build6
14 files changed, 35 insertions, 35 deletions
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 9a5e5da..897f70f 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -136,34 +136,34 @@
136 <Compile Include="Estate\EstateManager.cs"> 136 <Compile Include="Estate\EstateManager.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 <Compile Include="World\AvatarAnimations.cs"> 139 <Compile Include="World\World.cs">
140 <SubType>Code</SubType> 140 <SubType>Code</SubType>
141 </Compile> 141 </Compile>
142 <Compile Include="World\Avatar.cs"> 142 <Compile Include="World\World.PacketHandlers.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="World\Avatar.Update.cs"> 145 <Compile Include="World\World.Scripting.cs">
146 <SubType>Code</SubType> 146 <SubType>Code</SubType>
147 </Compile> 147 </Compile>
148 <Compile Include="World\Entity.cs"> 148 <Compile Include="World\WorldBase.cs">
149 <SubType>Code</SubType> 149 <SubType>Code</SubType>
150 </Compile> 150 </Compile>
151 <Compile Include="World\Primitive.cs"> 151 <Compile Include="World\Entities\Entity.cs">
152 <SubType>Code</SubType> 152 <SubType>Code</SubType>
153 </Compile> 153 </Compile>
154 <Compile Include="World\SceneObject.cs"> 154 <Compile Include="World\Entities\Primitive.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="World\World.cs"> 157 <Compile Include="World\Entities\SceneObject.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="World\World.PacketHandlers.cs"> 160 <Compile Include="World\Entities\Avatar\Avatar.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="World\WorldBase.cs"> 163 <Compile Include="World\Entities\Avatar\Avatar.Update.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="World\World.Scripting.cs"> 166 <Compile Include="World\Entities\Avatar\AvatarAnimations.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="World\scripting\IScriptContext.cs"> 169 <Compile Include="World\scripting\IScriptContext.cs">
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index d6ddf0a..bcfaaa7 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,16 +13,16 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ParcelManager.cs" /> 14 <include name="ParcelManager.cs" />
15 <include name="Estate/EstateManager.cs" /> 15 <include name="Estate/EstateManager.cs" />
16 <include name="World/AvatarAnimations.cs" />
17 <include name="World/Avatar.cs" />
18 <include name="World/Avatar.Update.cs" />
19 <include name="World/Entity.cs" />
20 <include name="World/Primitive.cs" />
21 <include name="World/SceneObject.cs" />
22 <include name="World/World.cs" /> 16 <include name="World/World.cs" />
23 <include name="World/World.PacketHandlers.cs" /> 17 <include name="World/World.PacketHandlers.cs" />
24 <include name="World/WorldBase.cs" />
25 <include name="World/World.Scripting.cs" /> 18 <include name="World/World.Scripting.cs" />
19 <include name="World/WorldBase.cs" />
20 <include name="World/Entities/Entity.cs" />
21 <include name="World/Entities/Primitive.cs" />
22 <include name="World/Entities/SceneObject.cs" />
23 <include name="World/Entities/Avatar/Avatar.cs" />
24 <include name="World/Entities/Avatar/Avatar.Update.cs" />
25 <include name="World/Entities/Avatar/AvatarAnimations.cs" />
26 <include name="World/scripting/IScriptContext.cs" /> 26 <include name="World/scripting/IScriptContext.cs" />
27 <include name="World/scripting/IScriptEntity.cs" /> 27 <include name="World/scripting/IScriptEntity.cs" />
28 <include name="World/scripting/IScriptHandler.cs" /> 28 <include name="World/scripting/IScriptHandler.cs" />
diff --git a/OpenSim/OpenSim.Region/World/Avatar.Update.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Update.cs
index d373fdb..d373fdb 100644
--- a/OpenSim/OpenSim.Region/World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Update.cs
diff --git a/OpenSim/OpenSim.Region/World/Avatar.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.cs
index c88e0cc..c88e0cc 100644
--- a/OpenSim/OpenSim.Region/World/Avatar.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.cs
diff --git a/OpenSim/OpenSim.Region/World/AvatarAnimations.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
index 585cf3c..585cf3c 100644
--- a/OpenSim/OpenSim.Region/World/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
diff --git a/OpenSim/OpenSim.Region/World/Entity.cs b/OpenSim/OpenSim.Region/World/Entities/Entity.cs
index 1620c89..1620c89 100644
--- a/OpenSim/OpenSim.Region/World/Entity.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Entity.cs
diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
index 0680eb3..0680eb3 100644
--- a/OpenSim/OpenSim.Region/World/Primitive.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
diff --git a/OpenSim/OpenSim.Region/World/SceneObject.cs b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
index 6ded881..6ded881 100644
--- a/OpenSim/OpenSim.Region/World/SceneObject.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 259d839..a6605a8 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -154,16 +154,16 @@
154 <Compile Include="PacketServer.cs"> 154 <Compile Include="PacketServer.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="UserConfigUtility.cs"> 157 <Compile Include="RegionServerBase.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="VersionInfo.cs"> 160 <Compile Include="UDPServer.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="RegionServerBase.cs"> 163 <Compile Include="UserConfigUtility.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="UDPServer.cs"> 166 <Compile Include="VersionInfo.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="Assets\AssetCache.cs"> 169 <Compile Include="Assets\AssetCache.cs">
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 32c1699..42792f0 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -21,10 +21,10 @@
21 <include name="NetworkServersInfo.cs" /> 21 <include name="NetworkServersInfo.cs" />
22 <include name="OpenSimNetworkHandler.cs" /> 22 <include name="OpenSimNetworkHandler.cs" />
23 <include name="PacketServer.cs" /> 23 <include name="PacketServer.cs" />
24 <include name="UserConfigUtility.cs" />
25 <include name="VersionInfo.cs" />
26 <include name="RegionServerBase.cs" /> 24 <include name="RegionServerBase.cs" />
27 <include name="UDPServer.cs" /> 25 <include name="UDPServer.cs" />
26 <include name="UserConfigUtility.cs" />
27 <include name="VersionInfo.cs" />
28 <include name="Assets/AssetCache.cs" /> 28 <include name="Assets/AssetCache.cs" />
29 <include name="Assets/InventoryCache.cs" /> 29 <include name="Assets/InventoryCache.cs" />
30 </sources> 30 </sources>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 6bcf38a..285c5be 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -95,6 +95,9 @@
95 <Compile Include="InterpreterLogic.cs"> 95 <Compile Include="InterpreterLogic.cs">
96 <SubType>Code</SubType> 96 <SubType>Code</SubType>
97 </Compile> 97 </Compile>
98 <Compile Include="InterpreterMethods.cs">
99 <SubType>Code</SubType>
100 </Compile>
98 <Compile Include="InterpreterReturn.cs"> 101 <Compile Include="InterpreterReturn.cs">
99 <SubType>Code</SubType> 102 <SubType>Code</SubType>
100 </Compile> 103 </Compile>
@@ -119,9 +122,6 @@
119 <Compile Include="Thread.cs"> 122 <Compile Include="Thread.cs">
120 <SubType>Code</SubType> 123 <SubType>Code</SubType>
121 </Compile> 124 </Compile>
122 <Compile Include="InterpreterMethods.cs">
123 <SubType>Code</SubType>
124 </Compile>
125 <Compile Include="Properties\AssemblyInfo.cs"> 125 <Compile Include="Properties\AssemblyInfo.cs">
126 <SubType>Code</SubType> 126 <SubType>Code</SubType>
127 </Compile> 127 </Compile>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index 2ff51ef..4eff97b 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -16,6 +16,7 @@
16 <include name="Heap.cs" /> 16 <include name="Heap.cs" />
17 <include name="Interpreter.cs" /> 17 <include name="Interpreter.cs" />
18 <include name="InterpreterLogic.cs" /> 18 <include name="InterpreterLogic.cs" />
19 <include name="InterpreterMethods.cs" />
19 <include name="InterpreterReturn.cs" /> 20 <include name="InterpreterReturn.cs" />
20 <include name="MainMemory.cs" /> 21 <include name="MainMemory.cs" />
21 <include name="MethodMemory.cs" /> 22 <include name="MethodMemory.cs" />
@@ -24,7 +25,6 @@
24 <include name="Stack.cs" /> 25 <include name="Stack.cs" />
25 <include name="StackFrame.cs" /> 26 <include name="StackFrame.cs" />
26 <include name="Thread.cs" /> 27 <include name="Thread.cs" />
27 <include name="InterpreterMethods.cs" />
28 <include name="Properties/AssemblyInfo.cs" /> 28 <include name="Properties/AssemblyInfo.cs" />
29 <include name="Types/ArrayReference.cs" /> 29 <include name="Types/ArrayReference.cs" />
30 <include name="Types/BaseType.cs" /> 30 <include name="Types/BaseType.cs" />
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 6f92e76..15ae5bf 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -90,19 +90,19 @@
90 </ProjectReference> 90 </ProjectReference>
91 </ItemGroup> 91 </ItemGroup>
92 <ItemGroup> 92 <ItemGroup>
93 <Compile Include="UUIDParcelQuery.cs"> 93 <Compile Include="AssemblyInfo.cs">
94 <SubType>Code</SubType> 94 <SubType>Code</SubType>
95 </Compile> 95 </Compile>
96 <Compile Include="UUIDPrimQuery.cs"> 96 <Compile Include="Db4LocalStorage.cs">
97 <SubType>Code</SubType> 97 <SubType>Code</SubType>
98 </Compile> 98 </Compile>
99 <Compile Include="Db4LocalStorage.cs"> 99 <Compile Include="MapStorage.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="AssemblyInfo.cs"> 102 <Compile Include="UUIDParcelQuery.cs">
103 <SubType>Code</SubType> 103 <SubType>Code</SubType>
104 </Compile> 104 </Compile>
105 <Compile Include="MapStorage.cs"> 105 <Compile Include="UUIDPrimQuery.cs">
106 <SubType>Code</SubType> 106 <SubType>Code</SubType>
107 </Compile> 107 </Compile>
108 </ItemGroup> 108 </ItemGroup>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 7fb50c8..c2fd2bd 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -11,11 +11,11 @@
11 <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > 11 <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="UUIDParcelQuery.cs" />
15 <include name="UUIDPrimQuery.cs" />
16 <include name="Db4LocalStorage.cs" />
17 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="Db4LocalStorage.cs" />
18 <include name="MapStorage.cs" /> 16 <include name="MapStorage.cs" />
17 <include name="UUIDParcelQuery.cs" />
18 <include name="UUIDPrimQuery.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
21 <lib> 21 <lib>
generated by cgit v1.1 at 2024-11-18 18:38:40 +0000