diff options
author | Justin Clark-Casey (justincc) | 2011-01-19 01:10:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-01-19 01:10:09 +0000 |
commit | 97c0430093a7d66551b3502c5f4a81bae54d7250 (patch) | |
tree | ff76ca73b855a32ae0f3f13c9ec2bc0d1950e04e /OpenSim | |
parent | Correct "show queues" to show queued packet numbers for each client instead o... (diff) | |
download | opensim-SC_OLD-97c0430093a7d66551b3502c5f4a81bae54d7250.zip opensim-SC_OLD-97c0430093a7d66551b3502c5f4a81bae54d7250.tar.gz opensim-SC_OLD-97c0430093a7d66551b3502c5f4a81bae54d7250.tar.bz2 opensim-SC_OLD-97c0430093a7d66551b3502c5f4a81bae54d7250.tar.xz |
Downgrade and comment out some other caps messages for now
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs index 09b9719..e11e252 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
105 | { | 105 | { |
106 | UUID capID = UUID.Random(); | 106 | UUID capID = UUID.Random(); |
107 | 107 | ||
108 | m_log.Info("[UploadObjectAssetModule]: /CAPS/" + capID); | 108 | // m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID); |
109 | caps.RegisterHandler("UploadObjectAsset", | 109 | caps.RegisterHandler("UploadObjectAsset", |
110 | new RestHTTPHandler("POST", "/CAPS/OA/" + capID + "/", | 110 | new RestHTTPHandler("POST", "/CAPS/OA/" + capID + "/", |
111 | delegate(Hashtable m_dhttpMethod) | 111 | delegate(Hashtable m_dhttpMethod) |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
156 | } | 156 | } |
157 | catch (Exception ex) | 157 | catch (Exception ex) |
158 | { | 158 | { |
159 | m_log.Error("[UploadObjectAssetModule]: Error deserializing message " + ex.ToString()); | 159 | m_log.Error("[UPLOAD OBJECT ASSET MODULE]: Error deserializing message " + ex.ToString()); |
160 | message = null; | 160 | message = null; |
161 | } | 161 | } |
162 | 162 | ||
@@ -363,9 +363,8 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
363 | responsedata["str_response_string"] = String.Format("<llsd><map><key>local_id</key>{0}</map></llsd>", ConvertUintToBytes(allparts[0].LocalId)); | 363 | responsedata["str_response_string"] = String.Format("<llsd><map><key>local_id</key>{0}</map></llsd>", ConvertUintToBytes(allparts[0].LocalId)); |
364 | 364 | ||
365 | return responsedata; | 365 | return responsedata; |
366 | |||
367 | |||
368 | } | 366 | } |
367 | |||
369 | private string ConvertUintToBytes(uint val) | 368 | private string ConvertUintToBytes(uint val) |
370 | { | 369 | { |
371 | byte[] resultbytes = Utils.UIntToBytes(val); | 370 | byte[] resultbytes = Utils.UIntToBytes(val); |
@@ -374,4 +373,4 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
374 | return String.Format("<binary encoding=\"base64\">{0}</binary>", Convert.ToBase64String(resultbytes)); | 373 | return String.Format("<binary encoding=\"base64\">{0}</binary>", Convert.ToBase64String(resultbytes)); |
375 | } | 374 | } |
376 | } | 375 | } |
377 | } | 376 | } \ No newline at end of file |