diff options
author | Diva Canto | 2009-09-03 12:42:25 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-03 12:42:25 -0700 |
commit | 639bf79aec2e6c7cb0bd660d80978248f1c4f6c0 (patch) | |
tree | 6a5f7c1ebf9c40d946a2cca249f9dce92ac81faf /OpenSim/Region/CoreModules/Avatar/Inventory | |
parent | Fixes seven leaky .BeginInvoke() calls (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.zip opensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.tar.gz opensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.tar.bz2 opensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 51 |
2 files changed, 30 insertions, 26 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 4ee90e2..f73a7e3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -199,6 +199,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
199 | InventoryFolderImpl inventoryFolder = null; | 199 | InventoryFolderImpl inventoryFolder = null; |
200 | InventoryItemBase inventoryItem = null; | 200 | InventoryItemBase inventoryItem = null; |
201 | 201 | ||
202 | /* | ||
202 | if (!m_userInfo.HasReceivedInventory) | 203 | if (!m_userInfo.HasReceivedInventory) |
203 | { | 204 | { |
204 | // If the region server has access to the user admin service (by which users are created), | 205 | // If the region server has access to the user admin service (by which users are created), |
@@ -220,13 +221,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
220 | m_userInfo.FetchInventory(); | 221 | m_userInfo.FetchInventory(); |
221 | } | 222 | } |
222 | } | 223 | } |
224 | */ | ||
223 | 225 | ||
224 | bool foundStar = false; | 226 | bool foundStar = false; |
225 | 227 | ||
226 | // Eliminate double slashes and any leading / on the path. This might be better done within InventoryFolderImpl | 228 | // Eliminate double slashes and any leading / on the path. This might be better done within InventoryFolderImpl |
227 | // itself (possibly at a small loss in efficiency). | 229 | // itself (possibly at a small loss in efficiency). |
228 | string[] components | 230 | string[] components |
229 | = m_invPath.Split(new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries); | 231 | = m_invPath.Split( |
232 | new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries); | ||
230 | 233 | ||
231 | int maxComponentIndex = components.Length - 1; | 234 | int maxComponentIndex = components.Length - 1; |
232 | 235 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index d3ba5fe..c495e02 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -64,6 +64,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
64 | /// </value> | 64 | /// </value> |
65 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 65 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
66 | private Scene m_aScene; | 66 | private Scene m_aScene; |
67 | |||
67 | /// <value> | 68 | /// <value> |
68 | /// The comms manager we will use for all comms requests | 69 | /// The comms manager we will use for all comms requests |
69 | /// </value> | 70 | /// </value> |
@@ -110,8 +111,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
110 | InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; | 111 | InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; |
111 | if (handlerInventoryArchiveSaved != null) | 112 | if (handlerInventoryArchiveSaved != null) |
112 | handlerInventoryArchiveSaved(succeeded, userInfo, invPath, saveStream, reportedException); | 113 | handlerInventoryArchiveSaved(succeeded, userInfo, invPath, saveStream, reportedException); |
114 | } | ||
115 | |||
116 | public void ArchiveInventory(string firstName, string lastName, string invPath, Stream saveStream) | ||
117 | { | ||
118 | if (m_scenes.Count > 0) | ||
119 | { | ||
120 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); | ||
121 | |||
122 | if (userInfo != null) | ||
123 | new InventoryArchiveWriteRequest(this, userInfo, invPath, saveStream).Execute(); | ||
124 | } | ||
125 | } | ||
126 | |||
127 | public void ArchiveInventory(string firstName, string lastName, string invPath, string savePath) | ||
128 | { | ||
129 | if (m_scenes.Count > 0) | ||
130 | { | ||
131 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); | ||
132 | |||
133 | if (userInfo != null) | ||
134 | new InventoryArchiveWriteRequest(this, userInfo, invPath, savePath).Execute(); | ||
135 | } | ||
113 | } | 136 | } |
114 | 137 | ||
115 | public void DearchiveInventory(string firstName, string lastName, string invPath, Stream loadStream) | 138 | public void DearchiveInventory(string firstName, string lastName, string invPath, Stream loadStream) |
116 | { | 139 | { |
117 | if (m_scenes.Count > 0) | 140 | if (m_scenes.Count > 0) |
@@ -125,18 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
125 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); | 148 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); |
126 | } | 149 | } |
127 | } | 150 | } |
128 | } | 151 | } |
129 | |||
130 | public void ArchiveInventory(string firstName, string lastName, string invPath, Stream saveStream) | ||
131 | { | ||
132 | if (m_scenes.Count > 0) | ||
133 | { | ||
134 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); | ||
135 | |||
136 | if (userInfo != null) | ||
137 | new InventoryArchiveWriteRequest(this, userInfo, invPath, saveStream).Execute(); | ||
138 | } | ||
139 | } | ||
140 | 152 | ||
141 | public void DearchiveInventory(string firstName, string lastName, string invPath, string loadPath) | 153 | public void DearchiveInventory(string firstName, string lastName, string invPath, string loadPath) |
142 | { | 154 | { |
@@ -151,18 +163,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
151 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); | 163 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); |
152 | } | 164 | } |
153 | } | 165 | } |
154 | } | 166 | } |
155 | |||
156 | public void ArchiveInventory(string firstName, string lastName, string invPath, string savePath) | ||
157 | { | ||
158 | if (m_scenes.Count > 0) | ||
159 | { | ||
160 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); | ||
161 | |||
162 | if (userInfo != null) | ||
163 | new InventoryArchiveWriteRequest(this, userInfo, invPath, savePath).Execute(); | ||
164 | } | ||
165 | } | ||
166 | 167 | ||
167 | /// <summary> | 168 | /// <summary> |
168 | /// Load inventory from an inventory file archive | 169 | /// Load inventory from an inventory file archive |