diff options
| author | Michael Cortez | 2009-08-06 09:38:51 -0700 |
|---|---|---|
| committer | Michael Cortez | 2009-08-06 09:38:51 -0700 |
| commit | 2ac04cb624d36c048b6793f9db7c073eb6a01026 (patch) | |
| tree | cb76f55c634c9f1107dea7204729497c5ba3bb75 /OpenSim/Server/Handlers | |
| parent | Fixing comments re: INI file. (diff) | |
| parent | Add the config-include statement to OpenSim.ini.example. (diff) | |
| download | opensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.zip opensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.gz opensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.bz2 opensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.xz | |
Merge branch 'master' into groups-core-contrib
Diffstat (limited to 'OpenSim/Server/Handlers')
| -rw-r--r-- | OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs index c2a64b8..8b41742 100644 --- a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs | |||
| @@ -46,12 +46,12 @@ namespace OpenSim.Server.Handlers.Freeswitch | |||
| 46 | { | 46 | { |
| 47 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 48 | 48 | ||
| 49 | private IFreeswitchService m_FreeswitchService; | 49 | //private IFreeswitchService m_FreeswitchService; |
| 50 | 50 | ||
| 51 | public FreeswitchServerGetHandler(IFreeswitchService service) : | 51 | public FreeswitchServerGetHandler(IFreeswitchService service) : |
| 52 | base("GET", "/api") | 52 | base("GET", "/api") |
| 53 | { | 53 | { |
| 54 | m_FreeswitchService = service; | 54 | //m_FreeswitchService = service; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | public override byte[] Handle(string path, Stream request, | 57 | public override byte[] Handle(string path, Stream request, |