diff options
author | Justin Clarke Casey | 2008-09-11 13:56:25 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-11 13:56:25 +0000 |
commit | f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c (patch) | |
tree | 4e07ccd7e55ae92c18360347796d5af92a057314 /OpenSim/Region/ClientStack | |
parent | * Removed some legacy commenting (diff) | |
download | opensim-SC_OLD-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.zip opensim-SC_OLD-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.gz opensim-SC_OLD-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.bz2 opensim-SC_OLD-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.xz |
* Start loading prims after region module configuration rather than before
* In some circumstances, loading prims can invoke region modules
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index dfe922b..8bb35c1 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -163,10 +163,7 @@ namespace OpenSim.Region.ClientStack | |||
163 | scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); | 163 | scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); |
164 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; | 164 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; |
165 | } | 165 | } |
166 | 166 | ||
167 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | ||
168 | scene.StartTimer(); | ||
169 | |||
170 | return scene; | 167 | return scene; |
171 | } | 168 | } |
172 | 169 | ||