diff options
| author | Justin Clarke Casey | 2009-06-12 14:29:42 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-06-12 14:29:42 +0000 |
| commit | cb6baacc31d4caab22ec28eb83461194e33c9cc9 (patch) | |
| tree | 76ea4f6ae5b8adb3aadb5774c370b0f06b4157e7 /OpenSim | |
| parent | * fix build break: sigh, must remember to build before committing (diff) | |
| download | opensim-SC-cb6baacc31d4caab22ec28eb83461194e33c9cc9.zip opensim-SC-cb6baacc31d4caab22ec28eb83461194e33c9cc9.tar.gz opensim-SC-cb6baacc31d4caab22ec28eb83461194e33c9cc9.tar.bz2 opensim-SC-cb6baacc31d4caab22ec28eb83461194e33c9cc9.tar.xz | |
* minor: remove one mono warning
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 8c3d993..14eb9a2 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
| @@ -352,7 +352,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
| 352 | texface.TextureID = asset.FullID; | 352 | texface.TextureID = asset.FullID; |
| 353 | tmptex.FaceTextures[Face] = texface; | 353 | tmptex.FaceTextures[Face] = texface; |
| 354 | } | 354 | } |
| 355 | catch(Exception e) | 355 | catch (Exception) |
| 356 | { | 356 | { |
| 357 | tmptex.DefaultTexture.TextureID = asset.FullID; | 357 | tmptex.DefaultTexture.TextureID = asset.FullID; |
| 358 | } | 358 | } |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs index ccbf570..ac5d067 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
| @@ -162,7 +162,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 162 | xtw.WriteEndElement(); | 162 | xtw.WriteEndElement(); |
| 163 | xtw.WriteEndElement(); | 163 | xtw.WriteEndElement(); |
| 164 | 164 | ||
| 165 | |||
| 166 | xtw.Flush(); | 165 | xtw.Flush(); |
| 167 | xtw.Close(); | 166 | xtw.Close(); |
| 168 | 167 | ||