diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
| parent | bad merge? (diff) | |
| download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index d58ab94..332bff9 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
| @@ -141,11 +141,6 @@ namespace OpenSim.Region.ClientStack | |||
| 141 | PhysicsPluginManager physicsPluginManager; | 141 | PhysicsPluginManager physicsPluginManager; |
| 142 | physicsPluginManager = new PhysicsPluginManager(); | 142 | physicsPluginManager = new PhysicsPluginManager(); |
| 143 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); | 143 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); |
| 144 | <<<<<<< HEAD | ||
| 145 | |||
| 146 | ======= | ||
| 147 | |||
| 148 | >>>>>>> avn/ubitvar | ||
| 149 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent); | 144 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent); |
| 150 | } | 145 | } |
| 151 | } | 146 | } |