diff options
| author | Melanie | 2012-10-12 19:05:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:05:06 +0100 |
| commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
| tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /OpenSim/Framework/Console | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
| download | opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/Console')
| -rw-r--r-- | OpenSim/Framework/Console/ConsoleUtil.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs index 2612a50..a7cf0c0 100644 --- a/OpenSim/Framework/Console/ConsoleUtil.cs +++ b/OpenSim/Framework/Console/ConsoleUtil.cs | |||
| @@ -34,7 +34,7 @@ using OpenMetaverse; | |||
| 34 | 34 | ||
| 35 | public class ConsoleUtil | 35 | public class ConsoleUtil |
| 36 | { | 36 | { |
| 37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 37 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 38 | 38 | ||
| 39 | public const string MinRawConsoleVectorValue = "-~"; | 39 | public const string MinRawConsoleVectorValue = "-~"; |
| 40 | public const string MaxRawConsoleVectorValue = "~"; | 40 | public const string MaxRawConsoleVectorValue = "~"; |
| @@ -107,7 +107,7 @@ public class ConsoleUtil | |||
| 107 | 107 | ||
| 108 | string semiDigestedConsoleVector = string.Join(VectorSeparator, semiDigestedComponents.ToArray()); | 108 | string semiDigestedConsoleVector = string.Join(VectorSeparator, semiDigestedComponents.ToArray()); |
| 109 | 109 | ||
| 110 | m_log.DebugFormat("[CONSOLE UTIL]: Parsing {0} into OpenMetaverse.Vector3", semiDigestedConsoleVector); | 110 | // m_log.DebugFormat("[CONSOLE UTIL]: Parsing {0} into OpenMetaverse.Vector3", semiDigestedConsoleVector); |
| 111 | 111 | ||
| 112 | return Vector3.TryParse(semiDigestedConsoleVector, out vector); | 112 | return Vector3.TryParse(semiDigestedConsoleVector, out vector); |
| 113 | } | 113 | } |