diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs index 09b9719..3114d7f 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 | ||
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
174 | Vector3 pos = avatar.AbsolutePosition + (Vector3.UnitX * avatar.Rotation); | 174 | Vector3 pos = avatar.AbsolutePosition + (Vector3.UnitX * avatar.Rotation); |
175 | Quaternion rot = Quaternion.Identity; | 175 | Quaternion rot = Quaternion.Identity; |
176 | Vector3 rootpos = Vector3.Zero; | 176 | Vector3 rootpos = Vector3.Zero; |
177 | Quaternion rootrot = Quaternion.Identity; | 177 | // Quaternion rootrot = Quaternion.Identity; |
178 | 178 | ||
179 | SceneObjectGroup rootGroup = null; | 179 | SceneObjectGroup rootGroup = null; |
180 | SceneObjectGroup[] allparts = new SceneObjectGroup[message.Objects.Length]; | 180 | SceneObjectGroup[] allparts = new SceneObjectGroup[message.Objects.Length]; |
@@ -186,11 +186,9 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
186 | if (i == 0) | 186 | if (i == 0) |
187 | { | 187 | { |
188 | rootpos = obj.Position; | 188 | rootpos = obj.Position; |
189 | rootrot = obj.Rotation; | 189 | // rootrot = obj.Rotation; |
190 | |||
191 | } | 190 | } |
192 | 191 | ||
193 | |||
194 | // Combine the extraparams data into it's ugly blob again.... | 192 | // Combine the extraparams data into it's ugly blob again.... |
195 | //int bytelength = 0; | 193 | //int bytelength = 0; |
196 | //for (int extparams = 0; extparams < obj.ExtraParams.Length; extparams++) | 194 | //for (int extparams = 0; extparams < obj.ExtraParams.Length; extparams++) |
@@ -363,9 +361,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)); | 361 | responsedata["str_response_string"] = String.Format("<llsd><map><key>local_id</key>{0}</map></llsd>", ConvertUintToBytes(allparts[0].LocalId)); |
364 | 362 | ||
365 | return responsedata; | 363 | return responsedata; |
366 | |||
367 | |||
368 | } | 364 | } |
365 | |||
369 | private string ConvertUintToBytes(uint val) | 366 | private string ConvertUintToBytes(uint val) |
370 | { | 367 | { |
371 | byte[] resultbytes = Utils.UIntToBytes(val); | 368 | byte[] resultbytes = Utils.UIntToBytes(val); |
@@ -374,4 +371,4 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
374 | return String.Format("<binary encoding=\"base64\">{0}</binary>", Convert.ToBase64String(resultbytes)); | 371 | return String.Format("<binary encoding=\"base64\">{0}</binary>", Convert.ToBase64String(resultbytes)); |
375 | } | 372 | } |
376 | } | 373 | } |
377 | } | 374 | } \ No newline at end of file |