diff options
| author | Melanie | 2009-08-05 18:38:42 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-05 18:38:42 +0100 |
| commit | b1e7e033900ccdc5383fedfd85ae3c1d88710a5c (patch) | |
| tree | 9494a331fbc35893e7a3d2c8fe23abff886060f6 /OpenSim/Server/Handlers | |
| parent | Add README to addon-modules (diff) | |
| parent | insert a little more debug info for TestReplicateArchivePathToUserInventory() (diff) | |
| download | opensim-SC_OLD-b1e7e033900ccdc5383fedfd85ae3c1d88710a5c.zip opensim-SC_OLD-b1e7e033900ccdc5383fedfd85ae3c1d88710a5c.tar.gz opensim-SC_OLD-b1e7e033900ccdc5383fedfd85ae3c1d88710a5c.tar.bz2 opensim-SC_OLD-b1e7e033900ccdc5383fedfd85ae3c1d88710a5c.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
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, |