From 39e052982baebb60801984965d8865886f20931d Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sat, 23 Aug 2014 19:10:15 +0200
Subject: [PATCH] Fix a null ref that will cause an exception if a grid region
 doesnt' specify a URI.

---
 OpenSim/Services/Interfaces/IGridService.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 3f4c958ce3..a3d237ffb8 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -141,6 +141,12 @@ namespace OpenSim.Services.Interfaces
                 }
             }
             set { 
+                if ( value == null)
+                {
+                    m_serverURI = String.Empty;
+                    return;
+                }
+
                 if ( value.EndsWith("/") ) {
                     m_serverURI = value;
                 } else {