diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-01 19:39:07 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-01 19:39:07 -0400 |
| commit | 2fc3f61a42c87ac78792fc9ecd477120b5265cde (patch) | |
| tree | 488fe929ba118da32642624042f3b86e4a117aea /OpenSim/Region/Framework | |
| parent | * Fixes diagonal teleporting when in RegionCombining mode by adding 4 additio... (diff) | |
| parent | adding new IniConfigSource() to SceneSetupHelpers to fix empty (diff) | |
| download | opensim-SC_OLD-2fc3f61a42c87ac78792fc9ecd477120b5265cde.zip opensim-SC_OLD-2fc3f61a42c87ac78792fc9ecd477120b5265cde.tar.gz opensim-SC_OLD-2fc3f61a42c87ac78792fc9ecd477120b5265cde.tar.bz2 opensim-SC_OLD-2fc3f61a42c87ac78792fc9ecd477120b5265cde.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 8cd1d55..7fb2d25 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
| @@ -367,7 +367,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 367 | presence2.AddAttachment(sog1); | 367 | presence2.AddAttachment(sog1); |
| 368 | presence2.AddAttachment(sog2); | 368 | presence2.AddAttachment(sog2); |
| 369 | 369 | ||
| 370 | IRegionModule serialiser = new SerialiserModule(); | 370 | ISharedRegionModule serialiser = new SerialiserModule(); |
| 371 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), serialiser); | 371 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), serialiser); |
| 372 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), serialiser); | 372 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), serialiser); |
| 373 | 373 | ||