aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-21 21:14:17 +0000
committerJustin Clarke Casey2009-01-21 21:14:17 +0000
commit37fa6775488ab237a4537d49b92a8d52b0497b98 (patch)
tree805183f2f807a8a051ba64878c079fb0a8c7fe17 /OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
parent* Restore commented out isdone assertions in TextureSendTests.T010_SendPkg() (diff)
downloadopensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.zip
opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.gz
opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.bz2
opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.xz
* refactor: Extract caps related code from scene and put into a region module
* No functional changes in this revision
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index a493117..f5b2823 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -558,7 +558,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
558 string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez"; 558 string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez";
559 string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez"; 559 string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez";
560 // Get a reference to the user's cap so we can pull out the Caps Object Path 560 // Get a reference to the user's cap so we can pull out the Caps Object Path
561 OpenSim.Framework.Communications.Capabilities.Caps userCap = homeScene.GetCapsHandlerForUser(agentData.AgentID); 561 OpenSim.Framework.Communications.Capabilities.Caps userCap
562 = homeScene.CapsModule.GetCapsHandlerForUser(agentData.AgentID);
562 563
563 string rezHttpProtocol = "http://"; 564 string rezHttpProtocol = "http://";
564 string regionCapsHttpProtocol = "http://"; 565 string regionCapsHttpProtocol = "http://";
@@ -681,9 +682,9 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
681 682
682 if (homeScene != null) 683 if (homeScene != null)
683 { 684 {
684 // Get a reference to their Cap object so we can pull out the capobjectroot 685 // Get a referenceokay - to their Cap object so we can pull out the capobjectroot
685 OpenSim.Framework.Communications.Capabilities.Caps userCap = 686 OpenSim.Framework.Communications.Capabilities.Caps userCap
686 homeScene.GetCapsHandlerForUser(userData.AgentID); 687 = homeScene.CapsModule.GetCapsHandlerForUser(userData.AgentID);
687 688
688 //Update the circuit data in the region so this user is authorized 689 //Update the circuit data in the region so this user is authorized
689 homeScene.UpdateCircuitData(userData); 690 homeScene.UpdateCircuitData(userData);