aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authordiva2009-03-26 16:05:00 +0000
committerdiva2009-03-26 16:05:00 +0000
commit28d9a735214975aca52df0ddd2e2def96526c6b3 (patch)
tree6cf2b1753f90ccac57733a0e73887535554acf96 /OpenSim/Framework
parentRead the .map files in on sim startup. Also clean them up when an assembly (diff)
downloadopensim-SC_OLD-28d9a735214975aca52df0ddd2e2def96526c6b3.zip
opensim-SC_OLD-28d9a735214975aca52df0ddd2e2def96526c6b3.tar.gz
opensim-SC_OLD-28d9a735214975aca52df0ddd2e2def96526c6b3.tar.bz2
opensim-SC_OLD-28d9a735214975aca52df0ddd2e2def96526c6b3.tar.xz
Small refactoring in Caps, no functional changes.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs30
1 files changed, 25 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index fde44be..8a4d145 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -153,6 +153,13 @@ namespace OpenSim.Framework.Communications.Capabilities
153 153
154 string capsBase = "/CAPS/" + m_capsObjectPath; 154 string capsBase = "/CAPS/" + m_capsObjectPath;
155 155
156 RegisterRegionServiceHandlers(capsBase);
157 RegisterInventoryServiceHandlers(capsBase);
158
159 }
160
161 public void RegisterRegionServiceHandlers(string capsBase)
162 {
156 try 163 try
157 { 164 {
158 // the root of all evil 165 // the root of all evil
@@ -164,6 +171,22 @@ namespace OpenSim.Framework.Communications.Capabilities
164 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", 171 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
165 // capsBase + m_mapLayerPath, 172 // capsBase + m_mapLayerPath,
166 // GetMapLayer); 173 // GetMapLayer);
174 m_capsHandlers["UpdateScriptTaskInventory"] =
175 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
176 m_capsHandlers["UpdateScriptTask"] = m_capsHandlers["UpdateScriptTaskInventory"];
177
178 }
179 catch (Exception e)
180 {
181 m_log.Error("[CAPS]: " + e.ToString());
182 }
183 }
184
185 public void RegisterInventoryServiceHandlers(string capsBase)
186 {
187 try
188 {
189 // I don't think this one works...
167 m_capsHandlers["NewFileAgentInventory"] = 190 m_capsHandlers["NewFileAgentInventory"] =
168 new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", 191 new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",
169 capsBase + m_newInventory, 192 capsBase + m_newInventory,
@@ -171,10 +194,7 @@ namespace OpenSim.Framework.Communications.Capabilities
171 m_capsHandlers["UpdateNotecardAgentInventory"] = 194 m_capsHandlers["UpdateNotecardAgentInventory"] =
172 new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory); 195 new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);
173 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; 196 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
174 m_capsHandlers["UpdateScriptTaskInventory"] =
175 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
176 m_capsHandlers["UpdateScriptAgent"] = m_capsHandlers["UpdateScriptAgentInventory"]; 197 m_capsHandlers["UpdateScriptAgent"] = m_capsHandlers["UpdateScriptAgentInventory"];
177 m_capsHandlers["UpdateScriptTask"] = m_capsHandlers["UpdateScriptTaskInventory"];
178 198
179 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and 199 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
180 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires 200 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires
@@ -186,8 +206,8 @@ namespace OpenSim.Framework.Communications.Capabilities
186 // This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid 206 // This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid
187 // we will be 207 // we will be
188 // able to get the data we need to implement the necessary part of the protocol to fix the issue above. 208 // able to get the data we need to implement the necessary part of the protocol to fix the issue above.
189// m_capsHandlers["FetchInventoryDescendents"] = 209 // m_capsHandlers["FetchInventoryDescendents"] =
190// new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest); 210 // new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest);
191 211
192 // m_capsHandlers["FetchInventoryDescendents"] = 212 // m_capsHandlers["FetchInventoryDescendents"] =
193 // new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST", 213 // new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST",