aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie Thielker2014-08-23 19:12:12 +0200
committerMelanie Thielker2014-08-23 19:12:12 +0200
commit3341bbbc3b26989bf19b73bd9597fb2bfc16c49a (patch)
tree4e68d552002b40053ce70de002306e2e4e97b00c /OpenSim/Services/Interfaces
parentIf GridUserService is asked for a nonexistent user, bail gracefully (diff)
parentFix a null ref that will cause an exception if a grid region doesnt' specify ... (diff)
downloadopensim-SC-3341bbbc3b26989bf19b73bd9597fb2bfc16c49a.zip
opensim-SC-3341bbbc3b26989bf19b73bd9597fb2bfc16c49a.tar.gz
opensim-SC-3341bbbc3b26989bf19b73bd9597fb2bfc16c49a.tar.bz2
opensim-SC-3341bbbc3b26989bf19b73bd9597fb2bfc16c49a.tar.xz
Merge branch 'avination-current'
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 4466222..4e6a0f6 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -152,6 +152,12 @@ namespace OpenSim.Services.Interfaces
152 } 152 }
153 } 153 }
154 set { 154 set {
155 if ( value == null)
156 {
157 m_serverURI = String.Empty;
158 return;
159 }
160
155 if ( value.EndsWith("/") ) { 161 if ( value.EndsWith("/") ) {
156 m_serverURI = value; 162 m_serverURI = value;
157 } else { 163 } else {