diff options
| author | Diva Canto | 2012-09-15 19:35:33 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-15 19:35:33 -0700 |
| commit | daa4745fb785d30de256f04c763bfd6478ea2238 (patch) | |
| tree | a68b49adb21eb5902f0e3a9687878e6c6db5e014 /OpenSim/Region/OptionalModules | |
| parent | More on HG2.0: added the possibility of controlling the appearance that avies... (diff) | |
| parent | BulletSim: update DLLs and SOs and remove some debugging code. (diff) | |
| download | opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.zip opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.tar.gz opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.tar.bz2 opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -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 fff3a32..bad75f7 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
| @@ -181,7 +181,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
| 181 | } | 181 | } |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | void OnOarFileLoaded(Guid requestId, string message) | 184 | void OnOarFileLoaded(Guid requestId, List<UUID> loadedScenes, string message) |
| 185 | { | 185 | { |
| 186 | m_oarFileLoading = true; | 186 | m_oarFileLoading = true; |
| 187 | 187 | ||