aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMW2007-06-23 11:14:58 +0000
committerMW2007-06-23 11:14:58 +0000
commit303ea70efad0ba703743f4a5b9812250c314c2d4 (patch)
tree47d6a28ef7b026ed0e0fd39619b1bacc6fe3ba55 /OpenSim/OpenSim.Region/Scenes/Scene.cs
parentDeleted some comments being wrote to console (diff)
downloadopensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.zip
opensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.tar.gz
opensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.tar.bz2
opensim-SC-303ea70efad0ba703743f4a5b9812250c314c2d4.tar.xz
More work on CAPS handler.
Diffstat (limited to 'OpenSim/OpenSim.Region/Scenes/Scene.cs')
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index 14c77c2..07f1d70 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Scenes
69 protected RegionCommsListener regionCommsHost; 69 protected RegionCommsListener regionCommsHost;
70 protected CommunicationsManager commsManager; 70 protected CommunicationsManager commsManager;
71 71
72 protected Caps TestCapsHandler; 72 protected List<Caps> capsHandlers = new List<Caps>();
73 protected BaseHttpServer httpListener; 73 protected BaseHttpServer httpListener;
74 74
75 public ParcelManager parcelManager; 75 public ParcelManager parcelManager;
@@ -132,8 +132,7 @@ namespace OpenSim.Region.Scenes
132 132
133 ScenePresence.LoadAnims(); 133 ScenePresence.LoadAnims();
134 this.httpListener = httpServer; 134 this.httpListener = httpServer;
135 this.TestCapsHandler = new Caps(httpListener, "127.0.0.1" , 9000); 135
136 this.TestCapsHandler.RegisterHandlers();
137 } 136 }
138 catch (Exception e) 137 catch (Exception e)
139 { 138 {
@@ -728,6 +727,13 @@ namespace OpenSim.Region.Scenes
728 //should just check that its meant for this region 727 //should just check that its meant for this region
729 if (regionHandle == this.m_regInfo.RegionHandle) 728 if (regionHandle == this.m_regInfo.RegionHandle)
730 { 729 {
730 if (agent.CapsPath != "")
731 {
732 //Console.WriteLine("new user, so creating caps handler for it");
733 Caps cap = new Caps(httpListener, this.m_regInfo.IPListenAddr, 9000, agent.CapsPath, agent.AgentID);
734 cap.RegisterHandlers();
735 this.capsHandlers.Add(cap);
736 }
731 this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 737 this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
732 } 738 }
733 } 739 }