From c211a120a5045c4b1ccaac7bfe7db13f75804cc3 Mon Sep 17 00:00:00 2001
From: mbowman
Date: Tue, 19 Jan 2010 15:50:30 -0800
Subject: Console output no longer requires loglevel to be set to info; you can
 run the simulator with log level WARN or ERROR and see the output of console
 commands

Signed-off-by: Melanie <melanie@t-data.com>
---
 OpenSim/Framework/Console/ConsoleBase.cs          | 2 +-
 OpenSim/Framework/Console/ConsolePluginCommand.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 OpenSim/Framework/Console/ConsoleBase.cs
 mode change 100644 => 100755 OpenSim/Framework/Console/ConsolePluginCommand.cs

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
old mode 100644
new mode 100755
index 0a51266..b70d1db
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Console
 
         public virtual void Output(string text)
         {
-            System.Console.Write(text);
+            System.Console.WriteLine(text);
         }
 
         public string CmdPrompt(string p)
diff --git a/OpenSim/Framework/Console/ConsolePluginCommand.cs b/OpenSim/Framework/Console/ConsolePluginCommand.cs
old mode 100644
new mode 100755
index a2f31ea..f4d3687
--- a/OpenSim/Framework/Console/ConsolePluginCommand.cs
+++ b/OpenSim/Framework/Console/ConsolePluginCommand.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Console
         /// </summary>
         public void ShowHelp(ConsoleBase console)
         {
-            console.Output(String.Join(" ", m_cmdText) + " - " + m_helpText);
+            console.Output(String.Join(" ", m_cmdText) + " - " + m_helpText + "\n");
         }
 
         /// <summary>
-- 
cgit v1.1


From 19d4867af7ee6c8f3005b116a545319cda8e1b25 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 26 Jan 2010 07:40:33 +1100
Subject: * Quick fix to Remote Console session ID handling.

---
 OpenSim/Framework/Console/RemoteConsole.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index c27072c..9fdd1b8 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -302,6 +302,12 @@ namespace OpenSim.Framework.Console
             if (!UUID.TryParse(post["ID"].ToString(), out id))
                 return reply;
 
+            lock(m_Connections)
+            {
+                if(!m_Connections.ContainsKey(id))
+                    return reply;
+            }
+
             if (post["COMMAND"] == null || post["COMMAND"].ToString() == String.Empty)
                 return reply;
 
-- 
cgit v1.1


From ccf7bfe09b4ae2fa4e4d680ddd08a23059267d40 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Tue, 26 Jan 2010 12:44:42 -0500
Subject: * a few more endlines..

---
 OpenSim/Framework/IClientAPI.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 3489af1..3f53258 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1447,10 +1447,10 @@ namespace OpenSim.Framework
         
         void SendUseCachedMuteList();
 
-        void SendMuteListUpdate(string filename);
-
-        void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
-
+        void SendMuteListUpdate(string filename);
+
+        void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
+
         void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
 
         void KillEndDone();
-- 
cgit v1.1


From 910d2177ad1e90d8b5748fbc8ffe9dbfe0c0fc9b Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Tue, 26 Jan 2010 12:49:53 -0500
Subject: * ..  More Endlines...

---
 OpenSim/Framework/Communications/Clients/RegionClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index 5ceaf39..ee7dec8 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Communications.Clients
             }
             // Add the regionhandle of the destination region
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
+            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
             args["teleport_flags"] = OSD.FromString(teleportFlags.ToString());
 
             string strBuffer = "";
-- 
cgit v1.1