From 4224b695acc2e1ad0199dc0ad7f560494182ed54 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sat, 9 Jun 2007 21:45:58 +0000
Subject: * LogFile now defaults to "{apptype}.log" * cleaned away suo and user
 files. * added handy string chat variety to the API * Moved LockPhysicsEngine
 on World to SyncRoot on IWorld * Introduced NextLocalId instead of World
 fuggliness. * Transformed GetRegionInfo to Property on IWorld for great
 justice * Extracted default wearables (good to have) * Deleted unused
 BaseServer * Used IWorld instead of World wherever possible * The client
 constructor's not getting unused port any longer. * Extracted ClientView
 factoring so PacketServer can be tweaked. * Added SendLayerData to World *
 Made WorldBase abstract and cleaned it up a bit * added
 OpenGrid.Framework.Communications.dll.build and OpenSim.World.dll.build to
 svn * Added code for two examples (but not in prebuild yet)

---
 .../OpenGrid.Framework.Communications.csproj       | 18 ++---
 .../OpenGrid.Framework.Communications.dll.build    | 51 +++++++++++++
 Common/OpenSim.Framework.Console/ConsoleBase.cs    |  6 ++
 .../OpenSim.Framework.Console.csproj.user          | 12 ----
 Common/OpenSim.Framework/Interfaces/IClientAPI.cs  |  1 +
 Common/OpenSim.Framework/Interfaces/IWorld.cs      |  5 +-
 Common/OpenSim.Framework/OpenSim.Framework.csproj  | 84 +++++++++++-----------
 .../OpenSim.Framework.csproj.user                  | 12 ----
 .../OpenSim.Framework/OpenSim.Framework.dll.build  | 60 ++++++++--------
 Common/OpenSim.Framework/Types/AgentWearable.cs    | 15 ++++
 .../Xml/OpenSim.GenericConfig.Xml.csproj.user      | 12 ----
 Common/OpenSim.Servers/BaseServer.cs               | 10 ---
 Common/OpenSim.Servers/OpenSim.Servers.csproj      | 13 ++--
 Common/OpenSim.Servers/OpenSim.Servers.csproj.user | 12 ----
 Common/OpenSim.Servers/OpenSim.Servers.dll.build   |  7 +-
 Common/XmlRpcCS/XMLRPC.csproj                      | 36 +++++-----
 Common/XmlRpcCS/XMLRPC.csproj.user                 | 12 ----
 Common/XmlRpcCS/XMLRPC.dll.build                   | 22 +++---
 18 files changed, 195 insertions(+), 193 deletions(-)
 create mode 100644 Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
 delete mode 100644 Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
 delete mode 100644 Common/OpenSim.Framework/OpenSim.Framework.csproj.user
 delete mode 100644 Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
 delete mode 100644 Common/OpenSim.Servers/BaseServer.cs
 delete mode 100644 Common/OpenSim.Servers/OpenSim.Servers.csproj.user
 delete mode 100644 Common/XmlRpcCS/XMLRPC.csproj.user

(limited to 'Common')

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 689210b..94682be 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -83,31 +83,31 @@
     <Compile Include="RegionServerCommsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionServerCommsOGS.cs">
+    <Compile Include="RegionServerCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionServerCommsManager.cs">
+    <Compile Include="RegionServerCommsOGS.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="GridServer\GridCommsManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserServer\UserCommsManagerOGS.cs">
+    <Compile Include="GridServer\GridCommsManagerLocal.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserServer\UserCommsManagerLocal.cs">
+    <Compile Include="GridServer\GridCommsManagerOGS.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserServer\UserCommsManagerBase.cs">
+    <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="GridServer\GridCommsManagerLocal.cs">
+    <Compile Include="UserServer\UserCommsManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="GridServer\GridCommsManagerOGS.cs">
+    <Compile Include="UserServer\UserCommsManagerLocal.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="GridServer\GridCommsManagerBase.cs">
+    <Compile Include="UserServer\UserCommsManagerOGS.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
new file mode 100644
index 0000000..a6616bf
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<project name="OpenGrid.Framework.Communications" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="RegionServerCommsLocal.cs" />
+                <include name="RegionServerCommsManager.cs" />
+                <include name="RegionServerCommsOGS.cs" />
+                <include name="GridServer/GridCommsManagerBase.cs" />
+                <include name="GridServer/GridCommsManagerLocal.cs" />
+                <include name="GridServer/GridCommsManagerOGS.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+                <include name="UserServer/UserCommsManagerBase.cs" />
+                <include name="UserServer/UserCommsManagerLocal.cs" />
+                <include name="UserServer/UserCommsManagerOGS.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/libsecondlife.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs
index 0377998..80a28e9 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/ConsoleBase.cs
@@ -54,6 +54,12 @@ namespace OpenSim.Framework.Console
             this.cmdparser = cmdparser;
             this.m_silent = silent;
             System.Console.WriteLine("ServerConsole.cs - creating new local console");
+            
+            if( String.IsNullOrEmpty( LogFile ) )
+            {
+                LogFile = componentname + ".log";
+            }
+            
             System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
             Log = File.AppendText(LogFile);
             Log.WriteLine("========================================================================");
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\sugilite\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index d5b2ae4..9d28dab 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Framework.Interfaces
         void OutPacket(Packet newPack);
         void SendWearables(AvatarWearable[] wearables);
         void SendRegionHandshake(RegionInfo regionInfo);
+        void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
         void SendLayerData(float[] map);
         void MoveAgentIntoRegion(RegionInfo regInfo);
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
index ab2d63d..eee30b7 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -10,6 +10,9 @@ namespace OpenSim.Framework.Interfaces
     {
         void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
         void RemoveAvatar(LLUUID agentID);
-        RegionInfo GetRegionInfo();
+        
+        RegionInfo RegionInfo { get; }
+        object SyncRoot { get; }
+        uint NextLocalId { get; }
     }
 }
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 7e14e6a..f72c5f5 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -90,58 +90,49 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RegionCommsHostBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting.cs">
+    <Compile Include="BlockingQueue.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserProfileManagerBase.cs">
+    <Compile Include="IRegionCommsHost.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LoginService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRegionCommsHost.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileManager.cs">
+    <Compile Include="RegionCommsHostBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BlockingQueue.cs">
+    <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserProfile.cs">
+    <Compile Include="SimProfile.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="SimProfileBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\LocalGridBase.cs">
+    <Compile Include="UserProfileManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\RemoteGridBase.cs">
+    <Compile Include="UserProfileManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\IAssetServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
+    <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\IGridServer.cs">
@@ -150,61 +141,64 @@
     <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IClientAPI.cs">
+    <Compile Include="Interfaces\IUserServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
+    <Compile Include="Interfaces\IWorld.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
+    <Compile Include="Interfaces\LocalGridBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">
+    <Compile Include="Interfaces\RemoteGridBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">
+    <Compile Include="Interfaces\Config\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IGridServerHost.cs">
+    <Compile Include="Interfaces\Config\IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">
+    <Compile Include="Interfaces\Remoting\IGridServerHost.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">
+    <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGenericConfig.cs">
+    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IUserConfig.cs">
+    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
+    <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
+    <Compile Include="Types\AgentCiruitData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\AgentWearable.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimData.cs">
+    <Compile Include="Types\AssetBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AssetLandmark.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\AssetStorage.cs">
@@ -213,19 +207,25 @@
     <Compile Include="Types\EstateSettings.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\OSVector3.cs">
+    <Compile Include="Types\Login.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\Login.cs">
+    <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\OSVector3.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\ParcelData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\PrimData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\sugilite\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 2678e54..7ead9a8 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,52 +11,52 @@
             <resources prefix="OpenSim.Framework" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="RegionCommsHostBase.cs" />
                 <include name="AgentInventory.cs" />
                 <include name="AuthenticateSessionBase.cs" />
-                <include name="Util.cs" />
-                <include name="Remoting.cs" />
-                <include name="UserProfileManagerBase.cs" />
-                <include name="LoginService.cs" />
-                <include name="IRegionCommsHost.cs" />
-                <include name="UserProfileManager.cs" />
                 <include name="BlockingQueue.cs" />
-                <include name="UserProfile.cs" />
-                <include name="SimProfileBase.cs" />
+                <include name="IRegionCommsHost.cs" />
+                <include name="LoginService.cs" />
+                <include name="RegionCommsHostBase.cs" />
+                <include name="Remoting.cs" />
                 <include name="SimProfile.cs" />
-                <include name="Interfaces/LocalGridBase.cs" />
-                <include name="Interfaces/RemoteGridBase.cs" />
-                <include name="Interfaces/IUserServer.cs" />
+                <include name="SimProfileBase.cs" />
+                <include name="UserProfile.cs" />
+                <include name="UserProfileManager.cs" />
+                <include name="UserProfileManagerBase.cs" />
+                <include name="Util.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
+                <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/IGridServer.cs" />
                 <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IClientAPI.cs" />
-                <include name="Interfaces/Scripting/IScriptEngine.cs" />
-                <include name="Interfaces/Scripting/IScriptAPI.cs" />
-                <include name="Interfaces/Remoting/IProxyServerHost.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
+                <include name="Interfaces/LocalGridBase.cs" />
+                <include name="Interfaces/RemoteGridBase.cs" />
+                <include name="Interfaces/Config/IGenericConfig.cs" />
+                <include name="Interfaces/Config/IGridConfig.cs" />
+                <include name="Interfaces/Config/IUserConfig.cs" />
+                <include name="Interfaces/Remoting/IGridServerHost.cs" />
                 <include name="Interfaces/Remoting/IProxyServerClient.cs" />
+                <include name="Interfaces/Remoting/IProxyServerHost.cs" />
                 <include name="Interfaces/Remoting/IRegionGridClient.cs" />
-                <include name="Interfaces/Remoting/IGridServerHost.cs" />
                 <include name="Interfaces/Remoting/IRegionSimHost.cs" />
                 <include name="Interfaces/Remoting/RegionGridClientBase.cs" />
-                <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IUserConfig.cs" />
-                <include name="Interfaces/Config/IGridConfig.cs" />
+                <include name="Interfaces/Scripting/IScriptAPI.cs" />
+                <include name="Interfaces/Scripting/IScriptEngine.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/NeighbourInfo.cs" />
-                <include name="Types/NetworkServersInfo.cs" />
-                <include name="Types/RegionInfo.cs" />
-                <include name="Types/ParcelData.cs" />
+                <include name="Types/AgentCiruitData.cs" />
                 <include name="Types/AgentWearable.cs" />
-                <include name="Types/PrimData.cs" />
+                <include name="Types/AssetBase.cs" />
+                <include name="Types/AssetLandmark.cs" />
                 <include name="Types/AssetStorage.cs" />
                 <include name="Types/EstateSettings.cs" />
-                <include name="Types/OSVector3.cs" />
-                <include name="Types/AgentCiruitData.cs" />
                 <include name="Types/Login.cs" />
-                <include name="Types/AssetLandmark.cs" />
-                <include name="Types/AssetBase.cs" />
+                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/NetworkServersInfo.cs" />
+                <include name="Types/OSVector3.cs" />
+                <include name="Types/ParcelData.cs" />
+                <include name="Types/PrimData.cs" />
+                <include name="Types/RegionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
index b7fbe3c..49c1292 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/Common/OpenSim.Framework/Types/AgentWearable.cs
@@ -14,5 +14,20 @@ namespace OpenSim.Framework.Types
         {
 
         }
+
+        public static AvatarWearable[] DefaultWearables
+        {
+            get
+            {
+                AvatarWearable[] defaultWearables =  new AvatarWearable[13]; //should be 13 of these
+                for (int i = 0; i < 13; i++)
+                {
+                    defaultWearables[i] = new AvatarWearable();
+                }
+                defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                defaultWearables[0].ItemID = LLUUID.Random();
+                return defaultWearables;
+            }
+        }
     }
 }
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\sugilite\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Common/OpenSim.Servers/BaseServer.cs b/Common/OpenSim.Servers/BaseServer.cs
deleted file mode 100644
index 0a4c498..0000000
--- a/Common/OpenSim.Servers/BaseServer.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Servers
-{
-    public class BaseServer
-    {
-    }
-}
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index 6768ce4..0c61f75 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,13 +92,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LoginServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="BaseHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BaseServer.cs">
+    <Compile Include="CheckSumServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="IRestHandler.cs">
@@ -107,18 +104,18 @@
     <Compile Include="LocalUserProfileManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LoginResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CheckSumServer.cs">
+    <Compile Include="LoginServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="XmlRpcMethod.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\sugilite\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index a2af584..ec868f1 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,15 +11,14 @@
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="LoginServer.cs" />
                 <include name="BaseHttpServer.cs" />
-                <include name="BaseServer.cs" />
+                <include name="CheckSumServer.cs" />
                 <include name="IRestHandler.cs" />
                 <include name="LocalUserProfileManager.cs" />
-                <include name="XmlRpcMethod.cs" />
                 <include name="LoginResponse.cs" />
-                <include name="CheckSumServer.cs" />
+                <include name="LoginServer.cs" />
                 <include name="UDPServerBase.cs" />
+                <include name="XmlRpcMethod.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 1ab494e..61f8be0 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,58 +70,58 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="XmlRpcBoxcarRequest.cs">
+    <Compile Include="Logger.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcRequest.cs">
+    <Compile Include="SimpleHttpRequest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcResponseSerializer.cs">
+    <Compile Include="XmlRpcBoxcarRequest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Logger.cs">
+    <Compile Include="XmlRpcClientProxy.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcRequestDeserializer.cs">
+    <Compile Include="XmlRpcDeserializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcExposedAttribute.cs">
+    <Compile Include="XmlRpcErrorCodes.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcResponse.cs">
+    <Compile Include="XmlRpcException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcException.cs">
+    <Compile Include="XmlRpcExposedAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcResponder.cs">
+    <Compile Include="XmlRpcRequest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcResponseDeserializer.cs">
+    <Compile Include="XmlRpcRequestDeserializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcServer.cs">
+    <Compile Include="XmlRpcRequestSerializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcErrorCodes.cs">
+    <Compile Include="XmlRpcResponder.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcSerializer.cs">
+    <Compile Include="XmlRpcResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcSystemObject.cs">
+    <Compile Include="XmlRpcResponseDeserializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimpleHttpRequest.cs">
+    <Compile Include="XmlRpcResponseSerializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcClientProxy.cs">
+    <Compile Include="XmlRpcSerializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcRequestSerializer.cs">
+    <Compile Include="XmlRpcServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcDeserializer.cs">
+    <Compile Include="XmlRpcSystemObject.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="XmlRpcXmlTokens.cs">
diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/XmlRpcCS/XMLRPC.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\sugilite\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index e7936c3..2eabfcd 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
             <resources prefix="XMLRPC" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="Logger.cs" />
+                <include name="SimpleHttpRequest.cs" />
                 <include name="XmlRpcBoxcarRequest.cs" />
+                <include name="XmlRpcClientProxy.cs" />
+                <include name="XmlRpcDeserializer.cs" />
+                <include name="XmlRpcErrorCodes.cs" />
+                <include name="XmlRpcException.cs" />
+                <include name="XmlRpcExposedAttribute.cs" />
                 <include name="XmlRpcRequest.cs" />
-                <include name="XmlRpcResponseSerializer.cs" />
-                <include name="Logger.cs" />
                 <include name="XmlRpcRequestDeserializer.cs" />
-                <include name="XmlRpcExposedAttribute.cs" />
-                <include name="XmlRpcResponse.cs" />
-                <include name="XmlRpcException.cs" />
+                <include name="XmlRpcRequestSerializer.cs" />
                 <include name="XmlRpcResponder.cs" />
+                <include name="XmlRpcResponse.cs" />
                 <include name="XmlRpcResponseDeserializer.cs" />
-                <include name="XmlRpcServer.cs" />
-                <include name="XmlRpcErrorCodes.cs" />
+                <include name="XmlRpcResponseSerializer.cs" />
                 <include name="XmlRpcSerializer.cs" />
+                <include name="XmlRpcServer.cs" />
                 <include name="XmlRpcSystemObject.cs" />
-                <include name="SimpleHttpRequest.cs" />
-                <include name="XmlRpcClientProxy.cs" />
-                <include name="XmlRpcRequestSerializer.cs" />
-                <include name="XmlRpcDeserializer.cs" />
                 <include name="XmlRpcXmlTokens.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
-- 
cgit v1.1