aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-16 00:01:21 +0000
committerJustin Clark-Casey (justincc)2011-11-16 00:01:21 +0000
commit33b1e385ec1ef494e8908be5d75920e62d0adb40 (patch)
treecaa0246c41919b481e943c4c6f931c3db9f3f65e
parentEnable log message to tell us what type of url is being requested from a user... (diff)
downloadopensim-SC_OLD-33b1e385ec1ef494e8908be5d75920e62d0adb40.zip
opensim-SC_OLD-33b1e385ec1ef494e8908be5d75920e62d0adb40.tar.gz
opensim-SC_OLD-33b1e385ec1ef494e8908be5d75920e62d0adb40.tar.bz2
opensim-SC_OLD-33b1e385ec1ef494e8908be5d75920e62d0adb40.tar.xz
Look up a homeURL only when it's not null, in addition to not being string.Empty
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index b982c85..83986e2 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
265 return userdata.ServerURLs[serverType].ToString(); 265 return userdata.ServerURLs[serverType].ToString();
266 } 266 }
267 267
268 if (userdata.HomeURL != string.Empty) 268 if (userData.HomeURL != null && userdata.HomeURL != string.Empty)
269 { 269 {
270 m_log.DebugFormat( 270 m_log.DebugFormat(
271 "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}", 271 "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}",