diff options
author | Justin Clarke Casey | 2008-03-31 18:41:24 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-31 18:41:24 +0000 |
commit | 106fd2f616cdd7086cf55325faf78b597d11f092 (patch) | |
tree | b5fd1f438eef62b3530a346cd8642f86fd7122ec /OpenSim/Region/Application | |
parent | * Minor: If a user exists but has no inventory in standalone, automatically c... (diff) | |
download | opensim-SC-106fd2f616cdd7086cf55325faf78b597d11f092.zip opensim-SC-106fd2f616cdd7086cf55325faf78b597d11f092.tar.gz opensim-SC-106fd2f616cdd7086cf55325faf78b597d11f092.tar.bz2 opensim-SC-106fd2f616cdd7086cf55325faf78b597d11f092.tar.xz |
* From: Dr Scofield <hud@zurich.ibm.com>
* (and Ansgar/Ansi)
* Fleshes out the voice stubs to better interact with the viewer CAPS requests - no actual voice support yet!
* In his own words
"the attached patch enhances the existing voice support by returning a proper voice account user and password and is preparing the config file so that we can specify a SIP server (not yet working). currently the SIP is hardcoded. the next step is to refactor voice support into a region module. working on that. "
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 60c6127..427fc70 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -240,7 +240,16 @@ namespace OpenSim | |||
240 | { | 240 | { |
241 | config.Set("enabled", "false"); | 241 | config.Set("enabled", "false"); |
242 | } | 242 | } |
243 | |||
244 | if (DefaultConfig.Configs["Voice"] == null) | ||
245 | DefaultConfig.AddConfig("Voice"); | ||
246 | config = DefaultConfig.Configs["Voice"]; | ||
247 | if (config != null) | ||
248 | { | ||
249 | config.Set("enabled", "false"); | ||
250 | } | ||
243 | return DefaultConfig; | 251 | return DefaultConfig; |
252 | |||
244 | } | 253 | } |
245 | 254 | ||
246 | protected void ReadConfigSettings() | 255 | protected void ReadConfigSettings() |