aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-19 17:41:21 +0000
committerJustin Clarke Casey2008-09-19 17:41:21 +0000
commit5fb7b485b211bbf19f4531a051b78dde92da4ba3 (patch)
tree655778d09beb953613b1db282dcf4cc640d90697 /OpenSim/Region/ClientStack
parentGuard LLRezObject against NaN (diff)
downloadopensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.zip
opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.gz
opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.bz2
opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.xz
* Only allow logins on standalone when the sim has completed it's initial startup (script startup doesn't count here)
* There was a small window where region logins were allowed before modules were loaded - avatars logins that hit this window could have caused bad things to happen. * A similar change will follow for grid mode sometime soon
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3b5e798..a55ce1c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4884,7 +4884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4884 InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID); 4884 InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID);
4885 if (assetRequestItem == null) 4885 if (assetRequestItem == null)
4886 { 4886 {
4887 assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID); 4887 assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID);
4888 if (assetRequestItem == null) 4888 if (assetRequestItem == null)
4889 return; 4889 return;
4890 } 4890 }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 469c084..4c6d51f 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -87,9 +87,7 @@ namespace OpenSim.Region.ClientStack
87 m_log.Error("[HTTP]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports"); 87 m_log.Error("[HTTP]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports");
88 } 88 }
89 89
90
91 m_log.Info("[REGION]: Starting HTTP server"); 90 m_log.Info("[REGION]: Starting HTTP server");
92
93 m_httpServer.Start(); 91 m_httpServer.Start();
94 } 92 }
95 93