Merge branch 'avination-current'

2014-08-23 19:12:12 +02:00 · 2014-08-23 19:12:12 +02:00 · 3341bbbc3b
parent 5f51abada9 39e052982b
commit 3341bbbc3b
1 changed files with 6 additions and 0 deletions
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@ -152,6 +152,12 @@ namespace OpenSim.Services.Interfaces
                }
            }
            set { 
+                if ( value == null)
+                {
+                    m_serverURI = String.Empty;
+                    return;
+                }
+
                if ( value.EndsWith("/") ) {
                    m_serverURI = value;
                } else {