diff options
author | Melanie Thielker | 2014-11-21 04:00:52 +0100 |
---|---|---|
committer | Melanie Thielker | 2014-11-21 04:00:52 +0100 |
commit | 80118ac0575ad6816f65ed7436ec4e0b384f231d (patch) | |
tree | 8f1597749206c5bec0c0fb71753f947ab1525aa2 /OpenSim/Region/OptionalModules/Avatar | |
parent | dont do recoil on llRezObject called from attachments, as seem to happen (diff) | |
download | opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.zip opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.gz opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.bz2 opensim-SC-80118ac0575ad6816f65ed7436ec4e0b384f231d.tar.xz |
Remove braindead "fix" that messed up intersim scripted giving.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 6ee15ad..e6b14c6 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -121,6 +121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
121 | 121 | ||
122 | public void Initialise(IConfigSource config) | 122 | public void Initialise(IConfigSource config) |
123 | { | 123 | { |
124 | MainConsole.Instance.Commands.AddCommand("vivox", false, "vivox debug", "vivox debug <on>|<off>", "Set vivox debugging", HandleDebug); | ||
124 | 125 | ||
125 | m_config = config.Configs["VivoxVoice"]; | 126 | m_config = config.Configs["VivoxVoice"]; |
126 | 127 | ||
@@ -1335,5 +1336,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1335 | result = String.Empty; | 1336 | result = String.Empty; |
1336 | return false; | 1337 | return false; |
1337 | } | 1338 | } |
1339 | |||
1340 | private void HandleDebug(string module, string[] cmd) | ||
1341 | { | ||
1342 | if (cmd.Length < 3) | ||
1343 | { | ||
1344 | MainConsole.Instance.Output("Error: missing on/off flag"); | ||
1345 | return; | ||
1346 | } | ||
1347 | |||
1348 | if (cmd[2] == "on") | ||
1349 | m_dumpXml = true; | ||
1350 | else if (cmd[2] == "off") | ||
1351 | m_dumpXml = false; | ||
1352 | else | ||
1353 | MainConsole.Instance.Output("Error: only on and off are supported"); | ||
1354 | } | ||
1338 | } | 1355 | } |
1339 | } | 1356 | } |