*Updated prebuild.xml and ran prebuild again

*Removed .user, .suo, and unneccessary files in /bin/Physics/
*OpenSim.sln should compile with nant and on windows now

2 files changed, 31 insertions, 43 deletions

diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index e164d5a..7f71949 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -94,112 +94,112 @@
     <Compile Include="AuthenticateSessionBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="BlockingQueue.cs">

+    <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IRegionCommsListener.cs">

+    <Compile Include="Logger.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LLSDHelpers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Logger.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="LoginService.cs">

+    <Compile Include="Remoting.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="RegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Remoting.cs">

+    <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfile.cs">

+    <Compile Include="BlockingQueue.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Util.cs">

+    <Compile Include="IRegionCommsListener.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="SimProfile.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\AuthenticateResponse.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Interfaces\IUserServer.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Interfaces\IAssetServer.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Interfaces\IWorld.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Interfaces\IClientAPI.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\ILocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IUserServer.cs">

+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IWorld.cs">

+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\Config\IGenericConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IGridConfig.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Interfaces\Config\IUserConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

+    <Compile Include="Interfaces\Config\IGridConfig.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AgentCiruitData.cs">

+    <Compile Include="Types\NeighbourInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AgentWearable.cs">

+    <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetBase.cs">

+    <Compile Include="Types\RegionHandle.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetLandmark.cs">

+    <Compile Include="Types\RegionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetStorage.cs">

+    <Compile Include="Types\ParcelData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\EstateSettings.cs">

+    <Compile Include="Types\AgentWearable.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\Login.cs">

+    <Compile Include="Types\PrimData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\MapBlockData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NeighbourInfo.cs">

+    <Compile Include="Types\AssetStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NetworkServersInfo.cs">

+    <Compile Include="Types\EstateSettings.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ParcelData.cs">

+    <Compile Include="Types\AgentCiruitData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\PrimData.cs">

+    <Compile Include="Types\Login.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionHandle.cs">

+    <Compile Include="Types\AssetLandmark.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionInfo.cs">

+    <Compile Include="Types\AssetBase.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj.user b/OpenSim/Framework/General/OpenSim.Framework.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/General/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:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\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>