diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index ba0b9b4..1dcab20 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -107,12 +107,12 @@ namespace OpenSim.Region.ClientStack | |||
107 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine); | 107 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine); |
108 | } | 108 | } |
109 | 109 | ||
110 | protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer, bool m_permissions) | 110 | protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer) |
111 | { | 111 | { |
112 | return SetupScene(regionInfo, 0, out clientServer, m_permissions); | 112 | return SetupScene(regionInfo, 0, out clientServer); |
113 | } | 113 | } |
114 | 114 | ||
115 | protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out IClientNetworkServer clientServer, bool m_permissions) | 115 | protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out IClientNetworkServer clientServer) |
116 | { | 116 | { |
117 | AgentCircuitManager circuitManager = new AgentCircuitManager(); | 117 | AgentCircuitManager circuitManager = new AgentCircuitManager(); |
118 | IPAddress listenIP = regionInfo.InternalEndPoint.Address; | 118 | IPAddress listenIP = regionInfo.InternalEndPoint.Address; |
@@ -162,8 +162,9 @@ namespace OpenSim.Region.ClientStack | |||
162 | scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero; | 162 | scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero; |
163 | } | 163 | } |
164 | 164 | ||
165 | scene.LoadPrimsFromStorage(m_permissions, regionInfo.originRegionID); | 165 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |
166 | scene.StartTimer(); | 166 | scene.StartTimer(); |
167 | |||
167 | return scene; | 168 | return scene; |
168 | } | 169 | } |
169 | 170 | ||