diff options
| author | Diva Canto | 2011-01-08 15:49:51 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-01-08 15:49:51 -0800 |
| commit | eab0951a591bc2576d6b361a6fa4c75f683bfa54 (patch) | |
| tree | fc80030688dc9088779f14b1d39fb9bb9b6c6ca6 /OpenSim/Region/Application | |
| parent | Try to fix a IAR problem reported by nebadon, where save iar seems stuck fore... (diff) | |
| download | opensim-SC-eab0951a591bc2576d6b361a6fa4c75f683bfa54.zip opensim-SC-eab0951a591bc2576d6b361a6fa4c75f683bfa54.tar.gz opensim-SC-eab0951a591bc2576d6b361a6fa4c75f683bfa54.tar.bz2 opensim-SC-eab0951a591bc2576d6b361a6fa4c75f683bfa54.tar.xz | |
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index e3b8573..51eb396 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -1146,7 +1146,7 @@ namespace OpenSim | |||
| 1146 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1146 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
| 1147 | } | 1147 | } |
| 1148 | } | 1148 | } |
| 1149 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); | 1149 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); |
| 1150 | } | 1150 | } |
| 1151 | else | 1151 | else |
| 1152 | { | 1152 | { |