diff options
author | Dr Scofield | 2009-05-05 16:17:52 +0000 |
---|---|---|
committer | Dr Scofield | 2009-05-05 16:17:52 +0000 |
commit | e0a06f641668cd5c25a7854af2faf8a61c4053ee (patch) | |
tree | c2a4620c4bdc0e479ca16528cd9e0524529a7998 /OpenSim/Region/CoreModules/InterGrid | |
parent | * Fix http://opensimulator.org/mantis/view.php?id=3585 (diff) | |
download | opensim-SC_OLD-e0a06f641668cd5c25a7854af2faf8a61c4053ee.zip opensim-SC_OLD-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.gz opensim-SC_OLD-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.bz2 opensim-SC_OLD-e0a06f641668cd5c25a7854af2faf8a61c4053ee.tar.xz |
- moving banned check and public/private check to
Scene.NewUserConnection()
- adding reason reporting
this enforces estate bans very early on and prevents us from
circulating client objects that we'd then have to retract once we
realize that the client is not allowed into the region
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid')
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index ad91d63..5278b74 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -545,7 +545,15 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
545 | homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile); | 545 | homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile); |
546 | 546 | ||
547 | // Call 'new user' event handler | 547 | // Call 'new user' event handler |
548 | homeScene.NewUserConnection(agentData); | 548 | string reason; |
549 | if (!homeScene.NewUserConnection(agentData, out reason)) | ||
550 | { | ||
551 | responseMap["connect"] = OSD.FromBoolean(false); | ||
552 | responseMap["message"] = OSD.FromString(String.Format("Connection refused: {0}", reason)); | ||
553 | m_log.ErrorFormat("[OGP]: rez_avatar/request failed: {0}", reason); | ||
554 | return responseMap; | ||
555 | } | ||
556 | |||
549 | 557 | ||
550 | //string raCap = string.Empty; | 558 | //string raCap = string.Empty; |
551 | 559 | ||