diff options
| author | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
| commit | 2205d1c486666399085f2e6d3b7d5d08474587cf (patch) | |
| tree | 10fa1e3ed522d4eefdd3770a531648ee2c9957f4 /OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |
| parent | * Attempts to resolve the megaregion terrain edit rebound. (diff) | |
| parent | Fix an omission in LSL that causes a viewer crash (diff) | |
| download | opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.zip opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.gz opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.bz2 opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index c727cec..10a3232 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
| @@ -557,7 +557,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
| 557 | 557 | ||
| 558 | // Call 'new user' event handler | 558 | // Call 'new user' event handler |
| 559 | string reason; | 559 | string reason; |
| 560 | if (!homeScene.NewUserConnection(agentData, out reason)) | 560 | if (!homeScene.NewUserConnection(agentData, (uint)TeleportFlags.ViaLogin, out reason)) |
| 561 | { | 561 | { |
| 562 | responseMap["connect"] = OSD.FromBoolean(false); | 562 | responseMap["connect"] = OSD.FromBoolean(false); |
| 563 | responseMap["message"] = OSD.FromString(String.Format("Connection refused: {0}", reason)); | 563 | responseMap["message"] = OSD.FromString(String.Format("Connection refused: {0}", reason)); |