aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-01-06 00:04:32 +0100
committerMelanie2012-01-06 00:04:32 +0100
commitdb482cb7ddbc7657112006052399fd1c27ee36f3 (patch)
tree73507b035d05d1faa89750636245a9e3341663da /OpenSim
parentRemove a dangling command registration (diff)
downloadopensim-SC_OLD-db482cb7ddbc7657112006052399fd1c27ee36f3.zip
opensim-SC_OLD-db482cb7ddbc7657112006052399fd1c27ee36f3.tar.gz
opensim-SC_OLD-db482cb7ddbc7657112006052399fd1c27ee36f3.tar.bz2
opensim-SC_OLD-db482cb7ddbc7657112006052399fd1c27ee36f3.tar.xz
Fix up asset stuff
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 4120872..2882906 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -84,12 +84,15 @@ namespace OpenSim.Services.Connectors
84 string serviceURI = assetConfig.GetString("AssetServerURI", 84 string serviceURI = assetConfig.GetString("AssetServerURI",
85 String.Empty); 85 String.Empty);
86 86
87 m_ServerURI = serviceURI;
88
87 if (serviceURI == String.Empty) 89 if (serviceURI == String.Empty)
88 { 90 {
89 m_log.Error("[ASSET CONNECTOR]: No Server URI named in section AssetService"); 91 m_log.Error("[ASSET CONNECTOR]: No Server URI named in section AssetService");
90 throw new Exception("Asset connector init error"); 92 throw new Exception("Asset connector init error");
91 } 93 }
92 94
95
93 m_retryTimer = new Timer(); 96 m_retryTimer = new Timer();
94 m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck); 97 m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck);
95 m_retryTimer.Interval = 60000; 98 m_retryTimer.Interval = 60000;