diff options
author | lbsa71 | 2007-07-17 00:07:26 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-17 00:07:26 +0000 |
commit | 47ea453b32fe8122ed2eb0d62607f65d3dbdddb8 (patch) | |
tree | 83877e94fdc053c3c0f5d2e431cbe8f49228840e /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * RegionApplicationBase restructuring now complete (diff) | |
download | opensim-SC-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.zip opensim-SC-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.tar.gz opensim-SC-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.tar.bz2 opensim-SC-47ea453b32fe8122ed2eb0d62607f65d3dbdddb8.tar.xz |
* debugged quite a lot of db-related strangeness and various refactoring goofs
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 671b222..5bba87a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
89 | return (this.phyScene); | 89 | return (this.phyScene); |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | private LandManager m_LandManager; | 93 | private LandManager m_LandManager; |
94 | public LandManager LandManager | 94 | public LandManager LandManager |
95 | { | 95 | { |
@@ -441,15 +441,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
441 | /// </summary> | 441 | /// </summary> |
442 | public void LoadPrimsFromStorage() | 442 | public void LoadPrimsFromStorage() |
443 | { | 443 | { |
444 | try | 444 | MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives"); |
445 | { | 445 | this.localStorage.LoadPrimitives(this); |
446 | MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives"); | ||
447 | this.localStorage.LoadPrimitives(this); | ||
448 | } | ||
449 | catch (Exception e) | ||
450 | { | ||
451 | MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); | ||
452 | } | ||
453 | } | 446 | } |
454 | 447 | ||
455 | /// <summary> | 448 | /// <summary> |