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 | |
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 '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs index 73bffa0..522c82d 100644 --- a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs | |||
@@ -34,31 +34,27 @@ namespace OpenSim.Region.Framework.Interfaces | |||
34 | { | 34 | { |
35 | public interface ICapabilitiesModule | 35 | public interface ICapabilitiesModule |
36 | { | 36 | { |
37 | void NewUserConnection(AgentCircuitData agent); | ||
38 | |||
39 | /// <summary> | 37 | /// <summary> |
40 | /// Add a caps handler for the given agent. If the CAPS handler already exists for this agent, | 38 | /// Add a caps handler for the given agent. If the CAPS handler already exists for this agent, |
41 | /// then it is replaced by a new CAPS handler. | 39 | /// then it is replaced by a new CAPS handler. |
42 | /// | ||
43 | /// FIXME: On login this is called twice, once for the login and once when the connection is made. | ||
44 | /// This is somewhat innefficient and should be fixed. The initial login creation is necessary | ||
45 | /// since the client asks for capabilities immediately after being informed of the seed. | ||
46 | /// </summary> | 40 | /// </summary> |
47 | /// <param name="agentId"></param> | 41 | /// <param name="agentId"></param> |
48 | /// <param name="capsObjectPath"></param> | 42 | /// <param name="capsObjectPath"></param> |
49 | void AddCapsHandler(UUID agentId); | 43 | void CreateCaps(UUID agentId); |
50 | 44 | ||
51 | /// <summary> | 45 | /// <summary> |
52 | /// Remove the caps handler for a given agent. | 46 | /// Remove the caps handler for a given agent. |
53 | /// </summary> | 47 | /// </summary> |
54 | /// <param name="agentId"></param> | 48 | /// <param name="agentId"></param> |
55 | void RemoveCapsHandler(UUID agentId); | 49 | void RemoveCaps(UUID agentId); |
56 | 50 | ||
57 | /// <summary> | 51 | /// <summary> |
58 | /// Will return null if the agent doesn't have a caps handler registered | 52 | /// Will return null if the agent doesn't have a caps handler registered |
59 | /// </summary> | 53 | /// </summary> |
60 | /// <param name="agentId"></param> | 54 | /// <param name="agentId"></param> |
61 | Caps GetCapsHandlerForUser(UUID agentId); | 55 | Caps GetCapsForUser(UUID agentId); |
56 | |||
57 | void SetAgentCapsSeeds(AgentCircuitData agent); | ||
62 | 58 | ||
63 | Dictionary<ulong, string> GetChildrenSeeds(UUID agentID); | 59 | Dictionary<ulong, string> GetChildrenSeeds(UUID agentID); |
64 | 60 | ||
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 | ||