diff options
author | Melanie | 2010-01-16 00:05:08 +0000 |
---|---|---|
committer | Melanie | 2010-01-16 00:05:08 +0000 |
commit | 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch) | |
tree | be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/ConsoleClient | |
parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
parent | Add "create user" instructions to README.txt (diff) | |
download | opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.zip opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2 opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz |
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'OpenSim/ConsoleClient')
-rw-r--r-- | OpenSim/ConsoleClient/ConsoleClient.cs | 8 |
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 | } |