aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie Thielker2014-08-23 19:10:15 +0200
committerMelanie Thielker2014-08-23 19:10:15 +0200
commit39e052982baebb60801984965d8865886f20931d (patch)
tree35ab9b44247ebbf74255f7c74fcaeb436d0f029a /OpenSim/Services/Interfaces
parentIf GridUserService is asked for a nonexistent user, bail gracefully (diff)
downloadopensim-SC_OLD-39e052982baebb60801984965d8865886f20931d.zip
opensim-SC_OLD-39e052982baebb60801984965d8865886f20931d.tar.gz
opensim-SC_OLD-39e052982baebb60801984965d8865886f20931d.tar.bz2
opensim-SC_OLD-39e052982baebb60801984965d8865886f20931d.tar.xz
Fix a null ref that will cause an exception if a grid region doesnt' specify a URI.
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 3f4c958..a3d237f 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -141,6 +141,12 @@ namespace OpenSim.Services.Interfaces
141 } 141 }
142 } 142 }
143 set { 143 set {
144 if ( value == null)
145 {
146 m_serverURI = String.Empty;
147 return;
148 }
149
144 if ( value.EndsWith("/") ) { 150 if ( value.EndsWith("/") ) {
145 m_serverURI = value; 151 m_serverURI = value;
146 } else { 152 } else {