diff options
| author | UbitUmarov | 2016-12-23 02:53:58 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-23 02:53:58 +0000 |
| commit | 86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55 (patch) | |
| tree | d61a1b20e0bd05f4b784c299f8e220608c9bcb34 /OpenSim/Region/Framework | |
| parent | update httpserver muting some socket errors that are normal (diff) | |
| parent | UserProfileModule threading issues (diff) | |
| download | opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.zip opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.tar.gz opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.tar.bz2 opensim-SC-86cc02f33e3c9a4a9c42eb1aaaaeaa828bee1b55.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs index 568cd34..ada407f 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |||
| @@ -271,7 +271,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 271 | IConfigSource configSource = new IniConfigSource(); | 271 | IConfigSource configSource = new IniConfigSource(); |
| 272 | IConfig config = configSource.AddConfig("Startup"); | 272 | IConfig config = configSource.AddConfig("Startup"); |
| 273 | config.Set("serverside_object_permissions", true); | 273 | config.Set("serverside_object_permissions", true); |
| 274 | config.Set("EventQueue", true); | ||
| 275 | 274 | ||
| 276 | EntityTransferModule etm = new EntityTransferModule(); | 275 | EntityTransferModule etm = new EntityTransferModule(); |
| 277 | 276 | ||