aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/GatekeeperService.cs
diff options
context:
space:
mode:
authorMelanie2010-05-03 21:25:40 +0100
committerMelanie2010-05-03 21:25:40 +0100
commitf61b879f2dd23470fe8e51a1f2d14c62b90043d4 (patch)
tree101882581a70b93fddd80049acbb8fef4ebe69ab /OpenSim/Services/HypergridService/GatekeeperService.cs
parentStore given items in correct parent folder. Fixes items given to offline avatars (diff)
parentAssorted bug fixes in hypergrid linking. (diff)
downloadopensim-SC_OLD-f61b879f2dd23470fe8e51a1f2d14c62b90043d4.zip
opensim-SC_OLD-f61b879f2dd23470fe8e51a1f2d14c62b90043d4.tar.gz
opensim-SC_OLD-f61b879f2dd23470fe8e51a1f2d14c62b90043d4.tar.bz2
opensim-SC_OLD-f61b879f2dd23470fe8e51a1f2d14c62b90043d4.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 56744b6..c5cfe75 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -119,7 +119,8 @@ namespace OpenSim.Services.HypergridService
119 imageURL = string.Empty; 119 imageURL = string.Empty;
120 reason = string.Empty; 120 reason = string.Empty;
121 121
122 m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", (regionName == string.Empty ? "default region" : regionName)); 122
123 m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", (regionName == string.Empty)? "default region" : regionName);
123 if (!m_AllowTeleportsToAnyRegion || regionName == string.Empty) 124 if (!m_AllowTeleportsToAnyRegion || regionName == string.Empty)
124 { 125 {
125 List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID); 126 List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID);