diff options
author | UbitUmarov | 2015-11-01 03:01:59 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-01 03:01:59 +0000 |
commit | 72684592ba196095311b308407cbe5751c6dd8dd (patch) | |
tree | c51a1fb67c6d425b1cb904e788bac8a720d951c8 /OpenSim/Region/CoreModules/Avatar | |
parent | fix cut points of UTF-8 strings (diff) | |
parent | Minor: Add an initializer to show what the default value would be. (diff) | |
download | opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.tar.xz |
Merge branch 'master' into avinationmerge
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 7d9609f..34b38b9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -802,6 +802,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
802 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | 802 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); |
803 | } | 803 | } |
804 | 804 | ||
805 | /* | ||
805 | [Test] | 806 | [Test] |
806 | public void TestSameSimulatorNeighbouringRegionsTeleportV1() | 807 | public void TestSameSimulatorNeighbouringRegionsTeleportV1() |
807 | { | 808 | { |
@@ -841,7 +842,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
841 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); | 842 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); |
842 | 843 | ||
843 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour | 844 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour |
844 | lscm.ServiceVersion = "SIMULATION/0.1"; | 845 | lscm.ServiceVersion = 0.1f; |
845 | 846 | ||
846 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); | 847 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); |
847 | 848 | ||
@@ -909,6 +910,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
909 | // Check events | 910 | // Check events |
910 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | 911 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); |
911 | } | 912 | } |
913 | */ | ||
912 | 914 | ||
913 | [Test] | 915 | [Test] |
914 | public void TestSameSimulatorNeighbouringRegionsTeleportV2() | 916 | public void TestSameSimulatorNeighbouringRegionsTeleportV2() |
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 0b5d95b..0472f31 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -63,18 +63,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
63 | { | 63 | { |
64 | m_config = config.Configs["Chat"]; | 64 | m_config = config.Configs["Chat"]; |
65 | 65 | ||
66 | if (null == m_config) | 66 | if (m_config != null) |
67 | { | 67 | { |
68 | m_log.Info("[CHAT]: no config found, plugin disabled"); | 68 | if (!m_config.GetBoolean("enabled", true)) |
69 | m_enabled = false; | 69 | { |
70 | return; | 70 | m_log.Info("[CHAT]: plugin disabled by configuration"); |
71 | } | 71 | m_enabled = false; |
72 | 72 | return; | |
73 | if (!m_config.GetBoolean("enabled", true)) | 73 | } |
74 | { | ||
75 | m_log.Info("[CHAT]: plugin disabled by configuration"); | ||
76 | m_enabled = false; | ||
77 | return; | ||
78 | } | 74 | } |
79 | 75 | ||
80 | m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); | 76 | m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); |