From a4fc6b5fbba7fd9a7b147b11a0d1c3ded1834d54 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 08:10:15 +0000
Subject: * Now there's one Console class, and instead the apps responds to
 cmd's and show's * Removed Golden Future TCP/SimChat options * Moved
 Ode.NET.dll to bin and changed prebuild accordingly (due to Prebuild
 limitations) * Normalized some namespaces * Added FxCop project * Added (temp
 disabled) Servers project (for great justice)

---
 .../Manager/OpenSim.Physics.Manager.csproj         |  4 +-
 .../Manager/OpenSim.Physics.Manager.dll.build      | 92 +++++++++++-----------
 OpenSim.Physics/Manager/PhysicsScene.cs            |  2 -
 3 files changed, 48 insertions(+), 50 deletions(-)

(limited to 'OpenSim.Physics/Manager')

diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 26a058c..0055c9c 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</ProjectGuid>
+    <ProjectGuid>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
-      <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project>
+      <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 4aaca6a..47e5534 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -1,46 +1,46 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Physics.Manager" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="PhysicsActor.cs" />
-                <include name="PhysicsManager.cs" />
-                <include name="PhysicsScene.cs" />
-                <include name="PhysicsVector.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/Axiom.MathLib.dll" />
-                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.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>
+<?xml version="1.0" ?>
+<project name="OpenSim.Physics.Manager" 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="OpenSim.Physics.Manager" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="PhysicsActor.cs" />
+                <include name="PhysicsManager.cs" />
+                <include name="PhysicsScene.cs" />
+                <include name="PhysicsVector.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/Axiom.MathLib.dll" />
+                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.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/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim.Physics/Manager/PhysicsScene.cs
index 35c961e..632b9cd 100644
--- a/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim.Physics/Manager/PhysicsScene.cs
@@ -76,8 +76,6 @@ namespace OpenSim.Physics.Manager
         public override void Simulate(float timeStep)
         {
             m_workIndicator = (m_workIndicator + 1) % 10;
-
-            OpenSim.Framework.Console.MainConsole.Instance.SetStatus(m_workIndicator.ToString());
         }
 
         public override void GetResults()
-- 
cgit v1.1