diff options
| author | Robert Adams | 2013-05-03 14:25:52 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-03 14:25:52 -0700 |
| commit | 1ffa69f691449fb240327505c94b18d4bf63c103 (patch) | |
| tree | d2c0c028badd4c491418845a56e9582c62dfacf2 /OpenSim/ApplicationPlugins/RemoteController | |
| parent | BulletSim: zero vehicle motion when changing vehicle type. (diff) | |
| parent | Fix possible race condition with local region cache if a region was added aft... (diff) | |
| download | opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.zip opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.gz opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.bz2 opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.xz | |
Merge branch 'master' into bulletsim4
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index d19b8b6..355f7b3 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -700,6 +700,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 700 | 700 | ||
| 701 | IScene newScene; | 701 | IScene newScene; |
| 702 | m_application.CreateRegion(region, out newScene); | 702 | m_application.CreateRegion(region, out newScene); |
| 703 | newScene.Start(); | ||
| 703 | 704 | ||
| 704 | // If an access specification was provided, use it. | 705 | // If an access specification was provided, use it. |
| 705 | // Otherwise accept the default. | 706 | // Otherwise accept the default. |