diff options
author | Justin Clark-Casey (justincc) | 2011-03-31 23:09:06 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-31 23:09:06 +0100 |
commit | 6ae76ede98c3fa7731daf7149a8831f474770fee (patch) | |
tree | b1db5bbe802290e54eae314fb9d4ecf0511b798c /OpenSim/Region | |
parent | Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.In... (diff) | |
download | opensim-SC-6ae76ede98c3fa7731daf7149a8831f474770fee.zip opensim-SC-6ae76ede98c3fa7731daf7149a8831f474770fee.tar.gz opensim-SC-6ae76ede98c3fa7731daf7149a8831f474770fee.tar.bz2 opensim-SC-6ae76ede98c3fa7731daf7149a8831f474770fee.tar.xz |
suspend check that IAR control file is loaded for now
I was mistaken - some previous opensim versions don't save this file first. Will have to bump iar version number and only check iars after the bump
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 9b98de3..01170aa 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -77,7 +77,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
77 | /// </value> | 77 | /// </value> |
78 | private Stream m_loadStream; | 78 | private Stream m_loadStream; |
79 | 79 | ||
80 | protected bool m_controlFileLoaded; | 80 | /// <summary> |
81 | /// FIXME: Do not perform this check since older versions of OpenSim do save the control file after other things | ||
82 | /// (I thought they weren't). We will need to bump the version number and perform this check on all | ||
83 | /// subsequent IAR versions only | ||
84 | /// </summary> | ||
85 | protected bool m_controlFileLoaded = true; | ||
81 | protected bool m_assetsLoaded; | 86 | protected bool m_assetsLoaded; |
82 | protected bool m_inventoryNodesLoaded; | 87 | protected bool m_inventoryNodesLoaded; |
83 | 88 | ||