aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-06-07 15:17:45 +0000
committermingchen2007-06-07 15:17:45 +0000
commit3fa76db3bec137b990c29f5cee4317551d20b1e3 (patch)
treebf0c52957a94d61a9f54107520e90537938ed8bf
parentFixing SVN: Adding hopefully everything else (2.5 / 3) (diff)
downloadopensim-SC-3fa76db3bec137b990c29f5cee4317551d20b1e3.zip
opensim-SC-3fa76db3bec137b990c29f5cee4317551d20b1e3.tar.gz
opensim-SC-3fa76db3bec137b990c29f5cee4317551d20b1e3.tar.bz2
opensim-SC-3fa76db3bec137b990c29f5cee4317551d20b1e3.tar.xz
Fixed SVN: All Done! Sorry for the delay (3 / 3)
Diffstat
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj6
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build2
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj46
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build22
-rw-r--r--OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs2
5 files changed, 39 insertions, 39 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 7634f16..8e33dd9 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -162,6 +162,9 @@
162 <Compile Include="Types\NeighbourInfo.cs"> 162 <Compile Include="Types\NeighbourInfo.cs">
163 <SubType>Code</SubType> 163 <SubType>Code</SubType>
164 </Compile> 164 </Compile>
165 <Compile Include="Types\ParcelData.cs">
166 <SubType>Code</SubType>
167 </Compile>
165 <Compile Include="Types\PrimData.cs"> 168 <Compile Include="Types\PrimData.cs">
166 <SubType>Code</SubType> 169 <SubType>Code</SubType>
167 </Compile> 170 </Compile>
@@ -183,9 +186,6 @@
183 <Compile Include="Types\AssetBase.cs"> 186 <Compile Include="Types\AssetBase.cs">
184 <SubType>Code</SubType> 187 <SubType>Code</SubType>
185 </Compile> 188 </Compile>
186 <Compile Include="Types\ParcelData.cs">
187 <SubType>Code</SubType>
188 </Compile>
189 </ItemGroup> 189 </ItemGroup>
190 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 190 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
191 <PropertyGroup> 191 <PropertyGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 2cf899d..8da7748 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -37,6 +37,7 @@
37 <include name="Interfaces/ILocalStorage.cs" /> 37 <include name="Interfaces/ILocalStorage.cs" />
38 <include name="Properties/AssemblyInfo.cs" /> 38 <include name="Properties/AssemblyInfo.cs" />
39 <include name="Types/NeighbourInfo.cs" /> 39 <include name="Types/NeighbourInfo.cs" />
40 <include name="Types/ParcelData.cs" />
40 <include name="Types/PrimData.cs" /> 41 <include name="Types/PrimData.cs" />
41 <include name="Types/AssetStorage.cs" /> 42 <include name="Types/AssetStorage.cs" />
42 <include name="Types/OSVector3.cs" /> 43 <include name="Types/OSVector3.cs" />
@@ -44,7 +45,6 @@
44 <include name="Types/Login.cs" /> 45 <include name="Types/Login.cs" />
45 <include name="Types/AssetLandmark.cs" /> 46 <include name="Types/AssetLandmark.cs" />
46 <include name="Types/AssetBase.cs" /> 47 <include name="Types/AssetBase.cs" />
47 <include name="Types/ParcelData.cs" />
48 </sources> 48 </sources>
49 <references basedir="${project::get-base-directory()}"> 49 <references basedir="${project::get-base-directory()}">
50 <lib> 50 <lib>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 298aab4..aa7ce5d 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,6 +124,9 @@
124 </ProjectReference> 124 </ProjectReference>
125 </ItemGroup> 125 </ItemGroup>
126 <ItemGroup> 126 <ItemGroup>
127 <Compile Include="OpenSimMain.cs">
128 <SubType>Code</SubType>
129 </Compile>
127 <Compile Include="UDPServer.cs"> 130 <Compile Include="UDPServer.cs">
128 <SubType>Code</SubType> 131 <SubType>Code</SubType>
129 </Compile> 132 </Compile>
@@ -142,6 +145,9 @@
142 <Compile Include="RegionInfoBase.cs"> 145 <Compile Include="RegionInfoBase.cs">
143 <SubType>Code</SubType> 146 <SubType>Code</SubType>
144 </Compile> 147 </Compile>
148 <Compile Include="PacketServer.cs">
149 <SubType>Code</SubType>
150 </Compile>
145 <Compile Include="RegionInfo.cs"> 151 <Compile Include="RegionInfo.cs">
146 <SubType>Code</SubType> 152 <SubType>Code</SubType>
147 </Compile> 153 </Compile>
@@ -157,49 +163,43 @@
157 <Compile Include="RegionServerBase.cs"> 163 <Compile Include="RegionServerBase.cs">
158 <SubType>Code</SubType> 164 <SubType>Code</SubType>
159 </Compile> 165 </Compile>
160 <Compile Include="OpenSimMain.cs">
161 <SubType>Code</SubType>
162 </Compile>
163 <Compile Include="PacketServer.cs">
164 <SubType>Code</SubType>
165 </Compile>
166 <Compile Include="Simulator\Avatar.Client.cs"> 166 <Compile Include="Simulator\Avatar.Client.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="Simulator\AvatarAnimations.cs"> 169 <Compile Include="Simulator\Entity.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="Simulator\World.Scripting.cs"> 172 <Compile Include="Simulator\Avatar.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="Simulator\Entity.cs"> 175 <Compile Include="Simulator\World.PacketHandlers.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="Simulator\WorldBase.cs"> 178 <Compile Include="Simulator\Avatar.Update.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="Simulator\Primitive2.cs"> 181 <Compile Include="Simulator\AvatarAnimations.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="Simulator\SceneObject.cs"> 184 <Compile Include="Simulator\ParcelManager.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 <Compile Include="Simulator\Primitive.cs"> 187 <Compile Include="Simulator\WorldBase.cs">
188 <SubType>Code</SubType> 188 <SubType>Code</SubType>
189 </Compile> 189 </Compile>
190 <Compile Include="Simulator\Avatar.cs"> 190 <Compile Include="Simulator\SceneObject.cs">
191 <SubType>Code</SubType> 191 <SubType>Code</SubType>
192 </Compile> 192 </Compile>
193 <Compile Include="Simulator\Avatar.Update.cs"> 193 <Compile Include="Simulator\World.cs">
194 <SubType>Code</SubType> 194 <SubType>Code</SubType>
195 </Compile> 195 </Compile>
196 <Compile Include="Simulator\ParcelManager.cs"> 196 <Compile Include="Simulator\Primitive.cs">
197 <SubType>Code</SubType> 197 <SubType>Code</SubType>
198 </Compile> 198 </Compile>
199 <Compile Include="Simulator\World.cs"> 199 <Compile Include="Simulator\World.Scripting.cs">
200 <SubType>Code</SubType> 200 <SubType>Code</SubType>
201 </Compile> 201 </Compile>
202 <Compile Include="Simulator\World.PacketHandlers.cs"> 202 <Compile Include="Simulator\Primitive2.cs">
203 <SubType>Code</SubType> 203 <SubType>Code</SubType>
204 </Compile> 204 </Compile>
205 <Compile Include="Estate\EstateManager.cs"> 205 <Compile Include="Estate\EstateManager.cs">
@@ -214,21 +214,21 @@
214 <Compile Include="Assets\AssetCache.cs"> 214 <Compile Include="Assets\AssetCache.cs">
215 <SubType>Code</SubType> 215 <SubType>Code</SubType>
216 </Compile> 216 </Compile>
217 <Compile Include="Scripting\IScriptContext.cs">
218 <SubType>Code</SubType>
219 </Compile>
220 <Compile Include="Scripting\IScriptHandler.cs"> 217 <Compile Include="Scripting\IScriptHandler.cs">
221 <SubType>Code</SubType> 218 <SubType>Code</SubType>
222 </Compile> 219 </Compile>
223 <Compile Include="Scripting\IScriptEntity.cs"> 220 <Compile Include="Scripting\ScriptFactory.cs">
224 <SubType>Code</SubType> 221 <SubType>Code</SubType>
225 </Compile> 222 </Compile>
226 <Compile Include="Scripting\ScriptFactory.cs"> 223 <Compile Include="Scripting\IScriptContext.cs">
227 <SubType>Code</SubType> 224 <SubType>Code</SubType>
228 </Compile> 225 </Compile>
229 <Compile Include="Scripting\Script.cs"> 226 <Compile Include="Scripting\Script.cs">
230 <SubType>Code</SubType> 227 <SubType>Code</SubType>
231 </Compile> 228 </Compile>
229 <Compile Include="Scripting\IScriptEntity.cs">
230 <SubType>Code</SubType>
231 </Compile>
232 <Compile Include="Scripting\Scripts\FollowRandomAvatar.cs"> 232 <Compile Include="Scripting\Scripts\FollowRandomAvatar.cs">
233 <SubType>Code</SubType> 233 <SubType>Code</SubType>
234 </Compile> 234 </Compile>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 3516332..204796e 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,41 +11,41 @@
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="OpenSimMain.cs" />
14 <include name="UDPServer.cs" /> 15 <include name="UDPServer.cs" />
15 <include name="AuthenticateSessionsLocal.cs" /> 16 <include name="AuthenticateSessionsLocal.cs" />
16 <include name="AuthenticateSessionsRemote.cs" /> 17 <include name="AuthenticateSessionsRemote.cs" />
17 <include name="OpenSimNetworkHandler.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
18 <include name="Grid.cs" /> 19 <include name="Grid.cs" />
19 <include name="RegionInfoBase.cs" /> 20 <include name="RegionInfoBase.cs" />
21 <include name="PacketServer.cs" />
20 <include name="RegionInfo.cs" /> 22 <include name="RegionInfo.cs" />
21 <include name="AuthenticateSessionsBase.cs" /> 23 <include name="AuthenticateSessionsBase.cs" />
22 <include name="VersionInfo.cs" /> 24 <include name="VersionInfo.cs" />
23 <include name="AgentAssetUpload.cs" /> 25 <include name="AgentAssetUpload.cs" />
24 <include name="RegionServerBase.cs" /> 26 <include name="RegionServerBase.cs" />
25 <include name="OpenSimMain.cs" />
26 <include name="PacketServer.cs" />
27 <include name="Simulator/Avatar.Client.cs" /> 27 <include name="Simulator/Avatar.Client.cs" />
28 <include name="Simulator/AvatarAnimations.cs" />
29 <include name="Simulator/World.Scripting.cs" />
30 <include name="Simulator/Entity.cs" /> 28 <include name="Simulator/Entity.cs" />
31 <include name="Simulator/WorldBase.cs" />
32 <include name="Simulator/Primitive2.cs" />
33 <include name="Simulator/SceneObject.cs" />
34 <include name="Simulator/Primitive.cs" />
35 <include name="Simulator/Avatar.cs" /> 29 <include name="Simulator/Avatar.cs" />
30 <include name="Simulator/World.PacketHandlers.cs" />
36 <include name="Simulator/Avatar.Update.cs" /> 31 <include name="Simulator/Avatar.Update.cs" />
32 <include name="Simulator/AvatarAnimations.cs" />
37 <include name="Simulator/ParcelManager.cs" /> 33 <include name="Simulator/ParcelManager.cs" />
34 <include name="Simulator/WorldBase.cs" />
35 <include name="Simulator/SceneObject.cs" />
38 <include name="Simulator/World.cs" /> 36 <include name="Simulator/World.cs" />
39 <include name="Simulator/World.PacketHandlers.cs" /> 37 <include name="Simulator/Primitive.cs" />
38 <include name="Simulator/World.Scripting.cs" />
39 <include name="Simulator/Primitive2.cs" />
40 <include name="Estate/EstateManager.cs" /> 40 <include name="Estate/EstateManager.cs" />
41 <include name="CAPS/AdminWebFront.cs" /> 41 <include name="CAPS/AdminWebFront.cs" />
42 <include name="Assets/InventoryCache.cs" /> 42 <include name="Assets/InventoryCache.cs" />
43 <include name="Assets/AssetCache.cs" /> 43 <include name="Assets/AssetCache.cs" />
44 <include name="Scripting/IScriptContext.cs" />
45 <include name="Scripting/IScriptHandler.cs" /> 44 <include name="Scripting/IScriptHandler.cs" />
46 <include name="Scripting/IScriptEntity.cs" />
47 <include name="Scripting/ScriptFactory.cs" /> 45 <include name="Scripting/ScriptFactory.cs" />
46 <include name="Scripting/IScriptContext.cs" />
48 <include name="Scripting/Script.cs" /> 47 <include name="Scripting/Script.cs" />
48 <include name="Scripting/IScriptEntity.cs" />
49 <include name="Scripting/Scripts/FollowRandomAvatar.cs" /> 49 <include name="Scripting/Scripts/FollowRandomAvatar.cs" />
50 <include name="Types/Mesh.cs" /> 50 <include name="Types/Mesh.cs" />
51 <include name="Types/Triangle.cs" /> 51 <include name="Types/Triangle.cs" />
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs
index 8e4565a..55ea795 100644
--- a/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.RegionServer.world.scripting 33namespace OpenSim.RegionServer.Scripting
34{ 34{
35 public class FollowRandomAvatar : Script 35 public class FollowRandomAvatar : Script
36 { 36 {
generated by cgit v1.1 at 2024-12-24 08:52:35 +0000