Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
2026-08-14 09:25:45 +08:00 · 2012-07-28 00:39:36 +01:00
parent 6930d696e9 72d29bdb40
commit 771d79e83e
70 changed files with 1735 additions and 653 deletions
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -112,7 +112,37 @@
      </Files>
    </Project>

+<<<<<<< HEAD:prebuild.xml
    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
+=======
+    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
+      <Reference name="OpenSim.Framework"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
+>>>>>>> master:prebuild.xml
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../../bin/</OutputPath>
@@ -130,6 +160,7 @@
      <Reference name="System.Xml"/>
      <Reference name="System.Web"/>
      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
      <Reference name="XMLRPC" path="../../../../bin/"/>
@@ -235,6 +266,7 @@
      </Files>
    </Project>

+<<<<<<< HEAD:prebuild.xml
    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library">
      <Configuration name="Debug">
        <Options>
@@ -260,6 +292,9 @@
    </Project>

    <Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library">
+=======
+    <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library">
+>>>>>>> master:prebuild.xml
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../bin/</OutputPath>
@@ -436,7 +471,7 @@
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
      <Reference name="XMLRPC" path="../../../bin/"/>
@@ -720,9 +755,9 @@
      <Reference name="System.Xml"/>
      <Reference name="System.Web"/>
      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Services.Interfaces"/>
      <Reference name="OpenMetaverse" path="../../bin/"/>
      <Reference name="OpenMetaverseTypes" path="../../bin/"/>
@@ -754,13 +789,13 @@
      <Reference name="System"/>
      <Reference name="System.Xml"/>
      <Reference name="System.Web"/>
+      <Reference name="OpenSim.Data"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/>
-      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Services.Interfaces"/>
      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
@@ -806,10 +841,10 @@
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Data"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Serialization"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>

      <!-- For scripting in funny languages by default -->
@@ -1525,10 +1560,10 @@
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Serialization"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
      <Reference name="OpenSim.Server.Base"/>
@@ -1616,11 +1651,11 @@
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Console"/>
      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
      <Reference name="XMLRPC" path="../../../bin/"/>
      <Reference name="Nini" path="../../../bin/"/>
@@ -1653,15 +1688,15 @@
      <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
      <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/>
      <Reference name="OpenMetaverse" path="../../../../../bin/"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
      <Reference name="OpenSim.Framework.Console"/>
      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.ClientStack"/>
+      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Services.Interfaces"/>
      <Reference name="Nini" path="../../../../../bin/"/>
      <Reference name="log4net" path="../../../../../bin/"/>
@@ -1744,9 +1779,9 @@
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Data"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
      <Reference name="OpenSim.Region.Framework"/>
@@ -1882,15 +1917,15 @@
      <Reference name="OpenMetaverse" path="../../../bin/"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.ClientStack"/>
-      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
      <Reference name="OpenSim.Server.Base"/>
      <Reference name="OpenSim.Services.Base"/>
      <Reference name="OpenSim.Services.Interfaces"/>
@@ -2403,10 +2438,11 @@
      <Reference name="OpenSim"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Framework.Console"/>
      <Reference name="OpenSim.Services.Interfaces"/>
      <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
      <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/>
@@ -2529,8 +2565,12 @@
      </Files>
    </Project>

+<<<<<<< HEAD:prebuild.xml

    <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
+=======
+    <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
+>>>>>>> master:prebuild.xml
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
@@ -2558,9 +2598,9 @@
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
      <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
      <Reference name="Mono.Addins"/>
@@ -3044,9 +3084,9 @@
      <Reference name="OpenSim.Framework.Serialization"/>
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3116,9 +3156,9 @@
      <Reference name="OpenSim.Framework.Serialization"/>
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.OptionalModules"/>
@@ -3175,8 +3215,8 @@
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
      <Reference name="OpenSim.Region.ClientStack.LindenCaps"/>
      <Reference name="OpenSim.Region.Framework"/>
@@ -3232,9 +3272,9 @@
      <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.ClientStack.LindenCaps"/>
      <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
      <Reference name="OpenSim.Region.CoreModules"/>
@@ -3269,7 +3309,7 @@
      <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
      <Reference name="OpenSim.Region.ClientStack"/>
      <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
      <Reference name="OpenSim.Region.CoreModules"/>