diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index dff9126..96f1198 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -207,17 +207,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
207 | { | 207 | { |
208 | byte[] data = null; | 208 | byte[] data = null; |
209 | 209 | ||
210 | <<<<<<< HEAD | ||
211 | AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); | ||
212 | m_Scene.AssetService.Store(asset); | ||
213 | m_Scene.CreateNewInventoryItem( | ||
214 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, | ||
215 | name, description, 0, callbackID, asset.FullID, asset.Type, invType, nextOwnerMask, creationDate); | ||
216 | } | ||
217 | else | ||
218 | ======= | ||
219 | if (invType == (sbyte)InventoryType.Landmark && presence != null) | 210 | if (invType == (sbyte)InventoryType.Landmark && presence != null) |
220 | >>>>>>> avn/ubitvar | ||
221 | { | 211 | { |
222 | string suffix = string.Empty, prefix = string.Empty; | 212 | string suffix = string.Empty, prefix = string.Empty; |
223 | string strdata = GenerateLandmark(presence, out prefix, out suffix); | 213 | string strdata = GenerateLandmark(presence, out prefix, out suffix); |
@@ -229,8 +219,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
229 | AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); | 219 | AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); |
230 | m_Scene.AssetService.Store(asset); | 220 | m_Scene.AssetService.Store(asset); |
231 | m_Scene.CreateNewInventoryItem( | 221 | m_Scene.CreateNewInventoryItem( |
232 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, | 222 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, |
233 | name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID); | 223 | name, description, 0, callbackID, asset.FullID, asset.Type, invType, nextOwnerMask, creationDate); |
234 | } | 224 | } |
235 | else | 225 | else |
236 | { | 226 | { |
@@ -420,26 +410,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
420 | { | 410 | { |
421 | if (objectGroup.RootPart.KeyframeMotion != null) | 411 | if (objectGroup.RootPart.KeyframeMotion != null) |
422 | { | 412 | { |
423 | <<<<<<< HEAD | ||
424 | objectGroup.RootPart.KeyframeMotion.Pause(); | ||
425 | group2Keyframe.Add(objectGroup, objectGroup.RootPart.KeyframeMotion); | ||
426 | objectGroup.RootPart.KeyframeMotion = null; | ||
427 | } | ||
428 | |||
429 | // Vector3 inventoryStoredPosition = new Vector3 | ||
430 | // (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize) | ||
431 | // ? 250 | ||
432 | // : objectGroup.AbsolutePosition.X) | ||
433 | // , | ||
434 | // (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize) | ||
435 | // ? 250 | ||
436 | // : objectGroup.AbsolutePosition.Y, | ||
437 | // objectGroup.AbsolutePosition.Z); | ||
438 | // | ||
439 | // originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition; | ||
440 | // | ||
441 | // objectGroup.AbsolutePosition = inventoryStoredPosition; | ||
442 | ======= | ||
443 | objectGroup.RootPart.KeyframeMotion.Suspend(); | 413 | objectGroup.RootPart.KeyframeMotion.Suspend(); |
444 | } | 414 | } |
445 | objectGroup.RootPart.SetForce(Vector3.Zero); | 415 | objectGroup.RootPart.SetForce(Vector3.Zero); |
@@ -480,7 +450,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
480 | 450 | ||
481 | objectGroup.AbsolutePosition = inventoryStoredPosition; | 451 | objectGroup.AbsolutePosition = inventoryStoredPosition; |
482 | objectGroup.RootPart.RotationOffset = inventoryStoredRotation; | 452 | objectGroup.RootPart.RotationOffset = inventoryStoredRotation; |
483 | >>>>>>> avn/ubitvar | ||
484 | 453 | ||
485 | // Make sure all bits but the ones we want are clear | 454 | // Make sure all bits but the ones we want are clear |
486 | // on take. | 455 | // on take. |
@@ -626,6 +595,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
626 | IClientAPI remoteClient) | 595 | IClientAPI remoteClient) |
627 | { | 596 | { |
628 | uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7; | 597 | uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7; |
598 | uint allObjectsNextOwnerPerms = 0x7fffffff; | ||
599 | |||
629 | // For the porposes of inventory, an object is modify if the prims | 600 | // For the porposes of inventory, an object is modify if the prims |
630 | // are modify. This allows renaming an object that contains no | 601 | // are modify. This allows renaming an object that contains no |
631 | // mod items. | 602 | // mod items. |