diff options
| author | Melanie | 2014-02-04 01:55:41 +0000 |
|---|---|---|
| committer | Melanie | 2014-02-04 01:55:41 +0000 |
| commit | e1d1c279651784d7290241b8c4b416bc4c96ab3c (patch) | |
| tree | 0a6f258ff2612b0faaf6aceadaa7be09b1f0386e /OpenSim/Region/OptionalModules/Scripting | |
| parent | Dropping the rest of Avination's modified appearance code for core. (diff) | |
| parent | Add "--no-objects" parameter to 'load oar'. (diff) | |
| download | opensim-SC_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.zip opensim-SC_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.gz opensim-SC_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.bz2 opensim-SC_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index 296ab87..d059b97 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
| @@ -304,7 +304,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
| 304 | finally | 304 | finally |
| 305 | { | 305 | { |
| 306 | if (os != null) | 306 | if (os != null) |
| 307 | os.Close(); | 307 | os.Dispose(); |
| 308 | } | 308 | } |
| 309 | } | 309 | } |
| 310 | } | 310 | } |