diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 1af61db..20df8a6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -912,7 +912,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
912 | string param, IOSHttpRequest httpRequest, | 912 | string param, IOSHttpRequest httpRequest, |
913 | IOSHttpResponse httpResponse) | 913 | IOSHttpResponse httpResponse) |
914 | { | 914 | { |
915 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 915 | // OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
916 | OSDMap resp = new OSDMap(); | 916 | OSDMap resp = new OSDMap(); |
917 | 917 | ||
918 | OSDMap accessPrefs = new OSDMap(); | 918 | OSDMap accessPrefs = new OSDMap(); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 17c7270..69dd76f 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |||
@@ -56,8 +56,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionConsoleModule")] | 56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionConsoleModule")] |
57 | public class RegionConsoleModule : INonSharedRegionModule, IRegionConsole | 57 | public class RegionConsoleModule : INonSharedRegionModule, IRegionConsole |
58 | { | 58 | { |
59 | private static readonly ILog m_log = | 59 | // private static readonly ILog m_log = |
60 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 60 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
61 | 61 | ||
62 | private Scene m_scene; | 62 | private Scene m_scene; |
63 | private IEventQueue m_eventQueue; | 63 | private IEventQueue m_eventQueue; |
@@ -157,8 +157,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
157 | 157 | ||
158 | public class ConsoleHandler : BaseStreamHandler | 158 | public class ConsoleHandler : BaseStreamHandler |
159 | { | 159 | { |
160 | private static readonly ILog m_log = | 160 | // private static readonly ILog m_log = |
161 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 161 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
162 | 162 | ||
163 | private RegionConsoleModule m_consoleModule; | 163 | private RegionConsoleModule m_consoleModule; |
164 | private UUID m_agentID; | 164 | private UUID m_agentID; |