diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index dadafa3..4211c20 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -78,8 +78,11 @@ namespace OpenSim.Region.Capabilities | |||
78 | private static readonly string m_notecardUpdatePath = "0004/"; | 78 | private static readonly string m_notecardUpdatePath = "0004/"; |
79 | private static readonly string m_notecardTaskUpdatePath = "0005/"; | 79 | private static readonly string m_notecardTaskUpdatePath = "0005/"; |
80 | private static readonly string m_fetchInventoryPath = "0006/"; | 80 | private static readonly string m_fetchInventoryPath = "0006/"; |
81 | private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; | 81 | |
82 | private static readonly string m_provisionVoiceAccountRequestPath = "0008/"; | 82 | // The following two entries are in a module, however, there also here so that we don't re-assign |
83 | // the path to another cap by mistake. | ||
84 | private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module. | ||
85 | private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module. | ||
83 | 86 | ||
84 | //private string eventQueue = "0100/"; | 87 | //private string eventQueue = "0100/"; |
85 | private BaseHttpServer m_httpListener; | 88 | private BaseHttpServer m_httpListener; |
@@ -195,6 +198,18 @@ namespace OpenSim.Region.Capabilities | |||
195 | // FIXME: these all should probably go into the respective region | 198 | // FIXME: these all should probably go into the respective region |
196 | // modules | 199 | // modules |
197 | 200 | ||
201 | // Request is like: | ||
202 | //<llsd> | ||
203 | // <map><key>folders</key> | ||
204 | // <array> | ||
205 | // <map> | ||
206 | // <key>fetch-folders</key><boolean>1</boolean><key>fetch-items</key><boolean>1</boolean><key>folder-id</key><uuid>8e1e3a30-b9bf-11dc-95ff-0800200c9a66</uuid><key>owner-id</key><uuid>11111111-1111-0000-0000-000100bba000</uuid><key>sort-order</key><integer>1</integer> | ||
207 | // </map> | ||
208 | // </array> | ||
209 | // </map> | ||
210 | //</llsd> | ||
211 | // | ||
212 | // multiple fetch-folder maps are allowed within the larger folders map. | ||
198 | public string FetchInventoryRequest(string request, string path, string param) | 213 | public string FetchInventoryRequest(string request, string path, string param) |
199 | { | 214 | { |
200 | string unmodifiedRequest = request.ToString(); | 215 | string unmodifiedRequest = request.ToString(); |
@@ -210,7 +225,6 @@ namespace OpenSim.Region.Capabilities | |||
210 | { | 225 | { |
211 | m_log.Error("[INVENTORY]: Fetch error: " + pe.Message); | 226 | m_log.Error("[INVENTORY]: Fetch error: " + pe.Message); |
212 | m_log.Error("Request:" + request.ToString()); | 227 | m_log.Error("Request:" + request.ToString()); |
213 | m_log.Error("OriginalRequest:" + unmodifiedRequest.ToString()); | ||
214 | } | 228 | } |
215 | //LLSDArray llsdFolderRequest = LLSDHelpers. | 229 | //LLSDArray llsdFolderRequest = LLSDHelpers. |
216 | ArrayList foldersrequested = (ArrayList)hash["folders"]; | 230 | ArrayList foldersrequested = (ArrayList)hash["folders"]; |