aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs18
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 769fe28..116c51f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.Linden
189 if (i == 0) 189 if (i == 0)
190 { 190 {
191 rootpos = obj.Position; 191 rootpos = obj.Position;
192// rootrot = obj.Rotation; 192// rootrot = obj.Rotation;
193 } 193 }
194 194
195 // Combine the extraparams data into it's ugly blob again.... 195 // Combine the extraparams data into it's ugly blob again....
@@ -284,6 +284,7 @@ namespace OpenSim.Region.ClientStack.Linden
284 prim.OwnerID = AgentId; 284 prim.OwnerID = AgentId;
285 prim.GroupID = obj.GroupID; 285 prim.GroupID = obj.GroupID;
286 prim.LastOwnerID = prim.OwnerID; 286 prim.LastOwnerID = prim.OwnerID;
287 prim.RezzerID = AgentId;
287 prim.CreationDate = Util.UnixTimeSinceEpoch(); 288 prim.CreationDate = Util.UnixTimeSinceEpoch();
288 prim.Name = obj.Name; 289 prim.Name = obj.Name;
289 prim.Description = ""; 290 prim.Description = "";
@@ -320,7 +321,7 @@ namespace OpenSim.Region.ClientStack.Linden
320 pbs.TextureEntry = tmp.GetBytes(); 321 pbs.TextureEntry = tmp.GetBytes();
321 prim.Shape = pbs; 322 prim.Shape = pbs;
322 prim.Scale = obj.Scale; 323 prim.Scale = obj.Scale;
323 324
324 SceneObjectGroup grp = new SceneObjectGroup(); 325 SceneObjectGroup grp = new SceneObjectGroup();
325 326
326 grp.SetRootPart(prim); 327 grp.SetRootPart(prim);
@@ -328,21 +329,22 @@ namespace OpenSim.Region.ClientStack.Linden
328 if (i == 0) 329 if (i == 0)
329 { 330 {
330 rootGroup = grp; 331 rootGroup = grp;
331 332
332 } 333 }
333 grp.AttachToScene(m_scene); 334 grp.AttachToScene(m_scene);
334 grp.AbsolutePosition = obj.Position; 335 grp.AbsolutePosition = obj.Position;
335 prim.RotationOffset = obj.Rotation; 336 prim.RotationOffset = obj.Rotation;
336 337
338
337 // Required for linking 339 // Required for linking
338 grp.RootPart.ClearUpdateSchedule(); 340 grp.RootPart.ClearUpdateSchedule();
339 341
340 if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos)) 342 if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos))
341 { 343 {
342 m_scene.AddSceneObject(grp); 344 m_scene.AddSceneObject(grp);
343 grp.AbsolutePosition = obj.Position; 345 grp.AbsolutePosition = obj.Position;
344 } 346 }
345 347
346 allparts[i] = grp; 348 allparts[i] = grp;
347 } 349 }
348 350
@@ -358,7 +360,7 @@ namespace OpenSim.Region.ClientStack.Linden
358 pos 360 pos
359 = m_scene.GetNewRezLocation( 361 = m_scene.GetNewRezLocation(
360 Vector3.Zero, rootpos, UUID.Zero, rot, (byte)1, 1, true, allparts[0].GroupScale, false); 362 Vector3.Zero, rootpos, UUID.Zero, rot, (byte)1, 1, true, allparts[0].GroupScale, false);
361 363
362 responsedata["int_response_code"] = 200; //501; //410; //404; 364 responsedata["int_response_code"] = 200; //501; //410; //404;
363 responsedata["content_type"] = "text/plain"; 365 responsedata["content_type"] = "text/plain";
364 responsedata["keepalive"] = false; 366 responsedata["keepalive"] = false;
@@ -366,7 +368,7 @@ namespace OpenSim.Region.ClientStack.Linden
366 368
367 return responsedata; 369 return responsedata;
368 } 370 }
369 371
370 private string ConvertUintToBytes(uint val) 372 private string ConvertUintToBytes(uint val)
371 { 373 {
372 byte[] resultbytes = Utils.UIntToBytes(val); 374 byte[] resultbytes = Utils.UIntToBytes(val);