diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index 713125c..6874662 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.... |
@@ -321,7 +321,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
321 | pbs.TextureEntry = tmp.GetBytes(); | 321 | pbs.TextureEntry = tmp.GetBytes(); |
322 | prim.Shape = pbs; | 322 | prim.Shape = pbs; |
323 | prim.Scale = obj.Scale; | 323 | prim.Scale = obj.Scale; |
324 | 324 | ||
325 | SceneObjectGroup grp = new SceneObjectGroup(); | 325 | SceneObjectGroup grp = new SceneObjectGroup(); |
326 | 326 | ||
327 | grp.SetRootPart(prim); | 327 | grp.SetRootPart(prim); |
@@ -329,21 +329,21 @@ namespace OpenSim.Region.ClientStack.Linden | |||
329 | if (i == 0) | 329 | if (i == 0) |
330 | { | 330 | { |
331 | rootGroup = grp; | 331 | rootGroup = grp; |
332 | 332 | ||
333 | } | 333 | } |
334 | grp.AttachToScene(m_scene); | 334 | grp.AttachToScene(m_scene); |
335 | grp.AbsolutePosition = obj.Position; | 335 | grp.AbsolutePosition = obj.Position; |
336 | prim.RotationOffset = obj.Rotation; | 336 | prim.RotationOffset = obj.Rotation; |
337 | 337 | ||
338 | // Required for linking | 338 | // Required for linking |
339 | grp.RootPart.ClearUpdateSchedule(); | 339 | grp.RootPart.ClearUpdateSchedule(); |
340 | 340 | ||
341 | if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos)) | 341 | if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos)) |
342 | { | 342 | { |
343 | m_scene.AddSceneObject(grp); | 343 | m_scene.AddSceneObject(grp); |
344 | grp.AbsolutePosition = obj.Position; | 344 | grp.AbsolutePosition = obj.Position; |
345 | } | 345 | } |
346 | 346 | ||
347 | allparts[i] = grp; | 347 | allparts[i] = grp; |
348 | } | 348 | } |
349 | 349 | ||
@@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
359 | pos | 359 | pos |
360 | = m_scene.GetNewRezLocation( | 360 | = m_scene.GetNewRezLocation( |
361 | Vector3.Zero, rootpos, UUID.Zero, rot, (byte)1, 1, true, allparts[0].GroupScale, false); | 361 | Vector3.Zero, rootpos, UUID.Zero, rot, (byte)1, 1, true, allparts[0].GroupScale, false); |
362 | 362 | ||
363 | responsedata["int_response_code"] = 200; //501; //410; //404; | 363 | responsedata["int_response_code"] = 200; //501; //410; //404; |
364 | responsedata["content_type"] = "text/plain"; | 364 | responsedata["content_type"] = "text/plain"; |
365 | responsedata["keepalive"] = false; | 365 | responsedata["keepalive"] = false; |
@@ -367,7 +367,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
367 | 367 | ||
368 | return responsedata; | 368 | return responsedata; |
369 | } | 369 | } |
370 | 370 | ||
371 | private string ConvertUintToBytes(uint val) | 371 | private string ConvertUintToBytes(uint val) |
372 | { | 372 | { |
373 | byte[] resultbytes = Utils.UIntToBytes(val); | 373 | byte[] resultbytes = Utils.UIntToBytes(val); |