aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-08 11:02:39 +0000
committerMelanie2010-01-08 11:02:39 +0000
commit3bf69aa5a3f76610412801857245a7aa6408e091 (patch)
tree1030845a1f17ca698a125e82d23348c645443e6d
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-3bf69aa5a3f76610412801857245a7aa6408e091.zip
opensim-SC-3bf69aa5a3f76610412801857245a7aa6408e091.tar.gz
opensim-SC-3bf69aa5a3f76610412801857245a7aa6408e091.tar.bz2
opensim-SC-3bf69aa5a3f76610412801857245a7aa6408e091.tar.xz
Change ConsoleClient to allow quoted values to be passed through. This
allows setting the login message remotely on the user server console
-rw-r--r--OpenSim/ConsoleClient/ConsoleClient.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs
index 783adef..d195d25 100644
--- a/OpenSim/ConsoleClient/ConsoleClient.cs
+++ b/OpenSim/ConsoleClient/ConsoleClient.cs
@@ -82,7 +82,13 @@ namespace OpenSim.ConsoleClient
82 82
83 private static void SendCommand(string module, string[] cmd) 83 private static void SendCommand(string module, string[] cmd)
84 { 84 {
85 string sendCmd = String.Join(" ", cmd); 85 string sendCmd = cmd[0];
86 if (cmd.Length > 1)
87 {
88 Array.Copy(cmd, 1, cmd, 0, cmd.Length-1);
89 Array.Resize(ref cmd, cmd.Length-1);
90 sendCmd += "\"" + String.Join("\" \"", cmd) + "\"";
91 }
86 92
87 Requester.MakeRequest("http://"+m_Host+":"+m_Port.ToString()+"/SessionCommand/", String.Format("ID={0}&COMMAND={1}", m_SessionID, sendCmd), CommandReply); 93 Requester.MakeRequest("http://"+m_Host+":"+m_Port.ToString()+"/SessionCommand/", String.Format("ID={0}&COMMAND={1}", m_SessionID, sendCmd), CommandReply);
88 } 94 }