aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-04 15:04:24 +0000
committerMelanie Thielker2009-05-04 15:04:24 +0000
commitf80ba373fa6c06eda6ed89de811cbd716d6b80f7 (patch)
treed6519a735b3f2e9360830aae38663466aab519b5
parent* Refactor: Simplify InventoryFolderImpl. No functional change. (diff)
downloadopensim-SC-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.zip
opensim-SC-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.tar.gz
opensim-SC-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.tar.bz2
opensim-SC-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.tar.xz
Prebuild changes to allow the console to reference the http server
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs15
-rw-r--r--prebuild.xml42
2 files changed, 37 insertions, 20 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index f254300..71f075e 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -31,6 +31,8 @@ using System.Diagnostics;
31using System.Reflection; 31using System.Reflection;
32using System.Text; 32using System.Text;
33using System.Threading; 33using System.Threading;
34using Nini.Config;
35using OpenSim.Framework.Servers.Interfaces;
34using log4net; 36using log4net;
35 37
36namespace OpenSim.Framework.Console 38namespace OpenSim.Framework.Console
@@ -41,10 +43,23 @@ namespace OpenSim.Framework.Console
41 { 43 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 45
46 private IHttpServer m_Server = null;
47 private IConfigSource m_Config = null;
48
44 public RemoteConsole(string defaultPrompt) : base(defaultPrompt) 49 public RemoteConsole(string defaultPrompt) : base(defaultPrompt)
45 { 50 {
46 } 51 }
47 52
53 public void ReadConfig(IConfigSource config)
54 {
55 m_Config = config;
56 }
57
58 public void SetServer(IHttpServer server)
59 {
60 m_Server = server;
61 }
62
48 public override void Output(string text) 63 public override void Output(string text)
49 { 64 {
50 } 65 }
diff --git a/prebuild.xml b/prebuild.xml
index 2f0b27b..b2f695a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -55,26 +55,6 @@
55 </Project> 55 </Project>
56--> 56-->
57 57
58 <Project name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
59 <Configuration name="Debug">
60 <Options>
61 <OutputPath>../../../bin/</OutputPath>
62 </Options>
63 </Configuration>
64 <Configuration name="Release">
65 <Options>
66 <OutputPath>../../../bin/</OutputPath>
67 </Options>
68 </Configuration>
69
70 <ReferencePath>../../../bin/</ReferencePath>
71 <Reference name="System"/>
72 <Reference name="log4net.dll"/>
73 <Files>
74 <Match pattern="*.cs" recurse="true"/>
75 </Files>
76 </Project>
77
78 <Project name="OpenSim.Framework" path="OpenSim/Framework" type="Library"> 58 <Project name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
79 <Configuration name="Debug"> 59 <Configuration name="Debug">
80 <Options> 60 <Options>
@@ -350,6 +330,28 @@
350 </Files> 330 </Files>
351 </Project> 331 </Project>
352 332
333 <Project name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
334 <Configuration name="Debug">
335 <Options>
336 <OutputPath>../../../bin/</OutputPath>
337 </Options>
338 </Configuration>
339 <Configuration name="Release">
340 <Options>
341 <OutputPath>../../../bin/</OutputPath>
342 </Options>
343 </Configuration>
344
345 <ReferencePath>../../../bin/</ReferencePath>
346 <Reference name="System"/>
347 <Reference name="log4net.dll"/>
348 <Reference name="Nini.dll"/>
349 <Reference name="OpenSim.Framework.Servers"/>
350 <Files>
351 <Match pattern="*.cs" recurse="true"/>
352 </Files>
353 </Project>
354
353 <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library"> 355 <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
354 <Configuration name="Debug"> 356 <Configuration name="Debug">
355 <Options> 357 <Options>