aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-13 18:31:05 +0000
committerJustin Clarke Casey2008-03-13 18:31:05 +0000
commit429ecb85080ba1c7f08cdee039393d3827374657 (patch)
treec0dd47aac8542835344d4ca64422c4f630f594f9
parentthis is a believed fix for some of the MySQL races. Testing would (diff)
downloadopensim-SC_OLD-429ecb85080ba1c7f08cdee039393d3827374657.zip
opensim-SC_OLD-429ecb85080ba1c7f08cdee039393d3827374657.tar.gz
opensim-SC_OLD-429ecb85080ba1c7f08cdee039393d3827374657.tar.bz2
opensim-SC_OLD-429ecb85080ba1c7f08cdee039393d3827374657.tar.xz
Just a few comments
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 5df6a06..893bd3e 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -266,8 +266,7 @@ namespace OpenSim.Region.Capabilities
266 #endregion 266 #endregion
267 267
268 /// <summary> 268 /// <summary>
269 /// Callback for a client request for an upload url for a script task 269 /// Called by the script task update handler. Provides a URL to which the client can upload a new asset.
270 /// inventory update
271 /// </summary> 270 /// </summary>
272 /// <param name="request"></param> 271 /// <param name="request"></param>
273 /// <param name="path"></param> 272 /// <param name="path"></param>
@@ -320,8 +319,7 @@ namespace OpenSim.Region.Capabilities
320 } 319 }
321 320
322 /// <summary> 321 /// <summary>
323 /// Callback for a client request for an upload url for a notecard (or script) 322 /// Called by the notecard update handler. Provides a URL to which the client can upload a new asset.
324 /// agent inventory update
325 /// </summary> 323 /// </summary>
326 /// <param name="request"></param> 324 /// <param name="request"></param>
327 /// <param name="path"></param> 325 /// <param name="path"></param>
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7ea528c..ba72841 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -94,7 +94,11 @@ namespace OpenSim.Region.Environment.Scenes
94 protected SceneCommunicationService m_sceneGridService; 94 protected SceneCommunicationService m_sceneGridService;
95 protected SceneXmlLoader m_sceneXmlLoader; 95 protected SceneXmlLoader m_sceneXmlLoader;
96 96
97 /// <summary>
98 /// Each agent has its own capabilities handler.
99 /// </summary>
97 protected Dictionary<LLUUID, Caps> m_capsHandlers = new Dictionary<LLUUID, Caps>(); 100 protected Dictionary<LLUUID, Caps> m_capsHandlers = new Dictionary<LLUUID, Caps>();
101
98 protected BaseHttpServer m_httpListener; 102 protected BaseHttpServer m_httpListener;
99 103
100 protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>(); 104 protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>();
@@ -614,7 +618,7 @@ namespace OpenSim.Region.Environment.Scenes
614 } 618 }
615 619
616 /// <summary> 620 /// <summary>
617 /// Start the timer which triggers regular scene updates 621 ///
618 /// </summary> 622 /// </summary>
619 public void StartTimer() 623 public void StartTimer()
620 { 624 {