diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 2 |
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 | ||