diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index ac3e199..a898992 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
134 | try | 134 | try |
135 | { | 135 | { |
136 | new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute(); | 136 | new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute(); |
137 | } | 137 | } |
138 | catch (EntryPointNotFoundException e) | 138 | catch (EntryPointNotFoundException e) |
139 | { | 139 | { |
140 | m_log.ErrorFormat( | 140 | m_log.ErrorFormat( |
@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
172 | try | 172 | try |
173 | { | 173 | { |
174 | new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute(); | 174 | new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute(); |
175 | } | 175 | } |
176 | catch (EntryPointNotFoundException e) | 176 | catch (EntryPointNotFoundException e) |
177 | { | 177 | { |
178 | m_log.ErrorFormat( | 178 | m_log.ErrorFormat( |
@@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
212 | try | 212 | try |
213 | { | 213 | { |
214 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); | 214 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); |
215 | } | 215 | } |
216 | catch (EntryPointNotFoundException e) | 216 | catch (EntryPointNotFoundException e) |
217 | { | 217 | { |
218 | m_log.ErrorFormat( | 218 | m_log.ErrorFormat( |
@@ -254,7 +254,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
254 | try | 254 | try |
255 | { | 255 | { |
256 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); | 256 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); |
257 | } | 257 | } |
258 | catch (EntryPointNotFoundException e) | 258 | catch (EntryPointNotFoundException e) |
259 | { | 259 | { |
260 | m_log.ErrorFormat( | 260 | m_log.ErrorFormat( |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 6357192..c5a6171 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2351,7 +2351,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2351 | /// </summary> | 2351 | /// </summary> |
2352 | /// <param name="partID"></param> | 2352 | /// <param name="partID"></param> |
2353 | /// <param name="sendEvents"></param> | 2353 | /// <param name="sendEvents"></param> |
2354 | /// <returns>The object group of the newly delinked prim.</returns> | 2354 | /// <returns>The object group of the newly delinked prim.</returns> |
2355 | public SceneObjectGroup DelinkFromGroup(SceneObjectPart linkPart, bool sendEvents) | 2355 | public SceneObjectGroup DelinkFromGroup(SceneObjectPart linkPart, bool sendEvents) |
2356 | { | 2356 | { |
2357 | // m_log.DebugFormat( | 2357 | // m_log.DebugFormat( |