diff options
| author | BlueWall | 2011-04-21 19:06:54 -0400 |
|---|---|---|
| committer | BlueWall | 2011-04-21 19:06:54 -0400 |
| commit | b8e282324ecdb608bb0ce47e878728b73cf1af56 (patch) | |
| tree | 44f9f8f872731857dfc0a6370819cd5595b927c6 /OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs | |
| parent | some mesh config asthetics (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.zip opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.gz opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.bz2 opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.xz | |
fix merge conflicts with OpenSimDefaults.ini
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs index ebbb1b0..25c18b6 100644 --- a/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs +++ b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs | |||
| @@ -64,7 +64,7 @@ namespace OpenSim.Services.FreeswitchService | |||
| 64 | m_freeSwitchDefaultWellKnownIP = freeswitchConfig.GetString("ServerAddress", String.Empty); | 64 | m_freeSwitchDefaultWellKnownIP = freeswitchConfig.GetString("ServerAddress", String.Empty); |
| 65 | if (m_freeSwitchDefaultWellKnownIP == String.Empty) | 65 | if (m_freeSwitchDefaultWellKnownIP == String.Empty) |
| 66 | { | 66 | { |
| 67 | m_log.Error("[FREESWITCH]: No FreeswitchServerAddress given, can't continue"); | 67 | m_log.Error("[FREESWITCH]: No ServerAddress given, cannot start service."); |
| 68 | return; | 68 | return; |
| 69 | } | 69 | } |
| 70 | 70 | ||