diff options
author | Diva Canto | 2011-05-01 18:22:53 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-01 18:22:53 -0700 |
commit | f79400e94ca6f8b609f5d4cbe25c5bbc04b61b77 (patch) | |
tree | 72fd894344eb030fab78be76475afae17c90a02a /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Change GetTextureModule.cs to conform to the new IRegion module interface. NO... (diff) | |
download | opensim-SC_OLD-f79400e94ca6f8b609f5d4cbe25c5bbc04b61b77.zip opensim-SC_OLD-f79400e94ca6f8b609f5d4cbe25c5bbc04b61b77.tar.gz opensim-SC_OLD-f79400e94ca6f8b609f5d4cbe25c5bbc04b61b77.tar.bz2 opensim-SC_OLD-f79400e94ca6f8b609f5d4cbe25c5bbc04b61b77.tar.xz |
Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.
Renamed a few methods that were misnomers.
Compiles but doesn't work.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7c5e246..b537381 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3033,7 +3033,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3033 | m_sceneGraph.removeUserCount(!childagentYN); | 3033 | m_sceneGraph.removeUserCount(!childagentYN); |
3034 | 3034 | ||
3035 | if (CapsModule != null) | 3035 | if (CapsModule != null) |
3036 | CapsModule.RemoveCapsHandler(agentID); | 3036 | CapsModule.RemoveCaps(agentID); |
3037 | 3037 | ||
3038 | // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever | 3038 | // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever |
3039 | // this method is doing is HORRIBLE!!! | 3039 | // this method is doing is HORRIBLE!!! |
@@ -3290,8 +3290,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3290 | 3290 | ||
3291 | if (CapsModule != null) | 3291 | if (CapsModule != null) |
3292 | { | 3292 | { |
3293 | CapsModule.NewUserConnection(agent); | 3293 | CapsModule.SetAgentCapsSeeds(agent); |
3294 | CapsModule.AddCapsHandler(agent.AgentID); | 3294 | CapsModule.CreateCaps(agent.AgentID); |
3295 | } | 3295 | } |
3296 | } | 3296 | } |
3297 | else | 3297 | else |
@@ -3309,7 +3309,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3309 | sp.AdjustKnownSeeds(); | 3309 | sp.AdjustKnownSeeds(); |
3310 | 3310 | ||
3311 | if (CapsModule != null) | 3311 | if (CapsModule != null) |
3312 | CapsModule.NewUserConnection(agent); | 3312 | CapsModule.SetAgentCapsSeeds(agent); |
3313 | } | 3313 | } |
3314 | } | 3314 | } |
3315 | 3315 | ||