diff options
| author | Melanie | 2009-12-23 21:21:22 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-23 21:21:22 +0000 |
| commit | f2d2073f2bd01f182c1b2238af9ba212ca999fd0 (patch) | |
| tree | 8ee2d879559aaad7f3df47023069899420232da7 /OpenSim/Region/CoreModules | |
| parent | Fix a bounds exception I came across in IAR restore (diff) | |
| parent | Change in how the Library returns its descendant folders, so that it includes... (diff) | |
| download | opensim-SC_OLD-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.zip opensim-SC_OLD-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.tar.gz opensim-SC_OLD-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.tar.bz2 opensim-SC_OLD-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 304c081..0ced2f9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
| @@ -174,7 +174,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 174 | 174 | ||
| 175 | return nodesLoaded; | 175 | return nodesLoaded; |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | public void Close() | ||
| 179 | { | ||
| 180 | if (m_loadStream != null) | ||
| 181 | m_loadStream.Close(); | ||
| 182 | } | ||
| 183 | |||
| 178 | /// <summary> | 184 | /// <summary> |
| 179 | /// Replicate the inventory paths in the archive to the user's inventory as necessary. | 185 | /// Replicate the inventory paths in the archive to the user's inventory as necessary. |
| 180 | /// </summary> | 186 | /// </summary> |