aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-12 00:10:51 +0100
committerJustin Clark-Casey (justincc)2012-10-12 00:10:51 +0100
commit387ce8ef35e7084895524507d6bba987b8c4a5d0 (patch)
treefb49de533245a57e841fe40d07d845836b254008
parentFix packetpool for ImprovedTerseObjectUpdate packets. (diff)
downloadopensim-SC_OLD-387ce8ef35e7084895524507d6bba987b8c4a5d0.zip
opensim-SC_OLD-387ce8ef35e7084895524507d6bba987b8c4a5d0.tar.gz
opensim-SC_OLD-387ce8ef35e7084895524507d6bba987b8c4a5d0.tar.bz2
opensim-SC_OLD-387ce8ef35e7084895524507d6bba987b8c4a5d0.tar.xz
Fix build break by moving OpenSim.Framework.Console back below HttpServer in the build order.
Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
-rw-r--r--OpenSim/Framework/Monitoring/StatsManager.cs3
-rw-r--r--prebuild.xml54
2 files changed, 28 insertions, 29 deletions
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index d365190..d7aff03 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Framework.Console;
31 30
32namespace OpenSim.Framework.Monitoring 31namespace OpenSim.Framework.Monitoring
33{ 32{
@@ -62,7 +61,7 @@ namespace OpenSim.Framework.Monitoring
62 public static UserStatsCollector UserStats { get { return userStats; } } 61 public static UserStatsCollector UserStats { get { return userStats; } }
63 public static SimExtraStatsCollector SimExtraStats { get { return simExtraStats; } } 62 public static SimExtraStatsCollector SimExtraStats { get { return simExtraStats; } }
64 63
65 public static void RegisterConsoleCommands(CommandConsole console) 64 public static void RegisterConsoleCommands(ICommandConsole console)
66 { 65 {
67 console.Commands.AddCommand( 66 console.Commands.AddCommand(
68 "General", 67 "General",
diff --git a/prebuild.xml b/prebuild.xml
index 77a0a5b..6c0adea 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -112,33 +112,6 @@
112 </Files> 112 </Files>
113 </Project> 113 </Project>
114 114
115 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
116 <Configuration name="Debug">
117 <Options>
118 <OutputPath>../../../bin/</OutputPath>
119 </Options>
120 </Configuration>
121 <Configuration name="Release">
122 <Options>
123 <OutputPath>../../../bin/</OutputPath>
124 </Options>
125 </Configuration>
126
127 <ReferencePath>../../../bin/</ReferencePath>
128 <Reference name="System"/>
129 <Reference name="System.Core"/>
130 <Reference name="System.Xml"/>
131 <Reference name="System.Web"/>
132 <Reference name="log4net" path="../../../bin/"/>
133 <Reference name="Nini" path="../../../bin/"/>
134 <Reference name="OpenSim.Framework"/>
135 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
136 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
137 <Files>
138 <Match pattern="*.cs" recurse="true"/>
139 </Files>
140 </Project>
141
142 <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library"> 115 <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
143 <Configuration name="Debug"> 116 <Configuration name="Debug">
144 <Options> 117 <Options>
@@ -234,6 +207,33 @@
234 </Files> 207 </Files>
235 </Project> 208 </Project>
236 209
210 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
211 <Configuration name="Debug">
212 <Options>
213 <OutputPath>../../../bin/</OutputPath>
214 </Options>
215 </Configuration>
216 <Configuration name="Release">
217 <Options>
218 <OutputPath>../../../bin/</OutputPath>
219 </Options>
220 </Configuration>
221
222 <ReferencePath>../../../bin/</ReferencePath>
223 <Reference name="System"/>
224 <Reference name="System.Core"/>
225 <Reference name="System.Xml"/>
226 <Reference name="System.Web"/>
227 <Reference name="log4net" path="../../../bin/"/>
228 <Reference name="Nini" path="../../../bin/"/>
229 <Reference name="OpenSim.Framework"/>
230 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
231 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
232 <Files>
233 <Match pattern="*.cs" recurse="true"/>
234 </Files>
235 </Project>
236
237 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library"> 237 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
238 <Configuration name="Debug"> 238 <Configuration name="Debug">
239 <Options> 239 <Options>