From 3fa76db3bec137b990c29f5cee4317551d20b1e3 Mon Sep 17 00:00:00 2001
From: mingchen <mingchen>
Date: Thu, 7 Jun 2007 15:17:45 +0000
Subject: [PATCH] Fixed SVN: All Done! Sorry for the delay (3 / 3)

---
 .../OpenSim.Framework.csproj                  |  6 +-
 .../OpenSim.Framework.dll.build               |  2 +-
 .../OpenSim.RegionServer.csproj               | 62 +++++++++----------
 .../OpenSim.RegionServer.dll.build            | 26 ++++----
 .../Scripting/Scripts/FollowRandomAvatar.cs   |  2 +-
 5 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 7634f163ae..8e33dd9fca 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -162,6 +162,9 @@
     <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\ParcelData.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -183,9 +186,6 @@
     <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 2cf899db68..8da7748436 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -37,6 +37,7 @@
                 <include name="Interfaces/ILocalStorage.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
                 <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/ParcelData.cs" />
                 <include name="Types/PrimData.cs" />
                 <include name="Types/AssetStorage.cs" />
                 <include name="Types/OSVector3.cs" />
@@ -44,7 +45,6 @@
                 <include name="Types/Login.cs" />
                 <include name="Types/AssetLandmark.cs" />
                 <include name="Types/AssetBase.cs" />
-                <include name="Types/ParcelData.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 298aab456e..aa7ce5df6d 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,6 +124,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="OpenSimMain.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -142,6 +145,9 @@
     <Compile Include="RegionInfoBase.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="PacketServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -157,49 +163,43 @@
     <Compile Include="RegionServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PacketServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Simulator\Avatar.Client.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Simulator\AvatarAnimations.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\World.Scripting.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Simulator\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Simulator\WorldBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Primitive2.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\SceneObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Simulator\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Simulator\Avatar.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Simulator\World.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Simulator\Avatar.Update.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Simulator\AvatarAnimations.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Simulator\ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Simulator\WorldBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Simulator\SceneObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Simulator\World.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Simulator\World.PacketHandlers.cs">
+    <Compile Include="Simulator\Primitive.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Simulator\World.Scripting.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Simulator\Primitive2.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Estate\EstateManager.cs">
@@ -214,21 +214,21 @@
     <Compile Include="Assets\AssetCache.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scripting\IScriptContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scripting\IScriptHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scripting\IScriptEntity.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scripting\ScriptFactory.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Scripting\IScriptContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Scripting\IScriptEntity.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Scripting\Scripts\FollowRandomAvatar.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 351633282a..204796e862 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,41 +11,41 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="OpenSimMain.cs" />
                 <include name="UDPServer.cs" />
                 <include name="AuthenticateSessionsLocal.cs" />
                 <include name="AuthenticateSessionsRemote.cs" />
                 <include name="OpenSimNetworkHandler.cs" />
                 <include name="Grid.cs" />
                 <include name="RegionInfoBase.cs" />
+                <include name="PacketServer.cs" />
                 <include name="RegionInfo.cs" />
                 <include name="AuthenticateSessionsBase.cs" />
                 <include name="VersionInfo.cs" />
                 <include name="AgentAssetUpload.cs" />
                 <include name="RegionServerBase.cs" />
-                <include name="OpenSimMain.cs" />
-                <include name="PacketServer.cs" />
                 <include name="Simulator/Avatar.Client.cs" />
-                <include name="Simulator/AvatarAnimations.cs" />
-                <include name="Simulator/World.Scripting.cs" />
                 <include name="Simulator/Entity.cs" />
-                <include name="Simulator/WorldBase.cs" />
-                <include name="Simulator/Primitive2.cs" />
-                <include name="Simulator/SceneObject.cs" />
-                <include name="Simulator/Primitive.cs" />
                 <include name="Simulator/Avatar.cs" />
-                <include name="Simulator/Avatar.Update.cs" />
-                <include name="Simulator/ParcelManager.cs" />
-                <include name="Simulator/World.cs" />
                 <include name="Simulator/World.PacketHandlers.cs" />
+                <include name="Simulator/Avatar.Update.cs" />
+                <include name="Simulator/AvatarAnimations.cs" />
+                <include name="Simulator/ParcelManager.cs" />
+                <include name="Simulator/WorldBase.cs" />
+                <include name="Simulator/SceneObject.cs" />
+                <include name="Simulator/World.cs" />
+                <include name="Simulator/Primitive.cs" />
+                <include name="Simulator/World.Scripting.cs" />
+                <include name="Simulator/Primitive2.cs" />
                 <include name="Estate/EstateManager.cs" />
                 <include name="CAPS/AdminWebFront.cs" />
                 <include name="Assets/InventoryCache.cs" />
                 <include name="Assets/AssetCache.cs" />
-                <include name="Scripting/IScriptContext.cs" />
                 <include name="Scripting/IScriptHandler.cs" />
-                <include name="Scripting/IScriptEntity.cs" />
                 <include name="Scripting/ScriptFactory.cs" />
+                <include name="Scripting/IScriptContext.cs" />
                 <include name="Scripting/Script.cs" />
+                <include name="Scripting/IScriptEntity.cs" />
                 <include name="Scripting/Scripts/FollowRandomAvatar.cs" />
                 <include name="Types/Mesh.cs" />
                 <include name="Types/Triangle.cs" />
diff --git a/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.RegionServer/Scripting/Scripts/FollowRandomAvatar.cs
index 8e4565a9d3..55ea79521c 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;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.RegionServer.world.scripting
+namespace OpenSim.RegionServer.Scripting
 {
     public class FollowRandomAvatar : Script
     {