aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorubit2012-09-07 19:17:21 +0200
committerubit2012-09-07 19:17:21 +0200
commita99026691bac2280f06b8961c72340a7466992f7 (patch)
tree69b37d7e3b4aaab738dff36a4d67cdd7af833fcb /OpenSim/Services
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent One more redundante ParcelProprieties on login (diff)
downloadopensim-SC_OLD-a99026691bac2280f06b8961c72340a7466992f7.zip
opensim-SC_OLD-a99026691bac2280f06b8961c72340a7466992f7.tar.gz
opensim-SC_OLD-a99026691bac2280f06b8961c72340a7466992f7.tar.bz2
opensim-SC_OLD-a99026691bac2280f06b8961c72340a7466992f7.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 091e41a..9e04601 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Services.Connectors
129 string ret = serverUri.Uri.AbsoluteUri; 129 string ret = serverUri.Uri.AbsoluteUri;
130 if (ret.EndsWith("/")) 130 if (ret.EndsWith("/"))
131 ret = ret.Substring(0, ret.Length - 1); 131 ret = ret.Substring(0, ret.Length - 1);
132 return serverUri.Uri.AbsoluteUri; 132 return ret;
133 } 133 }
134 134
135 protected void retryCheck(object source, ElapsedEventArgs e) 135 protected void retryCheck(object source, ElapsedEventArgs e)