aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tools
diff options
context:
space:
mode:
authorMelanie2013-03-26 03:40:06 +0000
committerMelanie2013-03-26 03:40:06 +0000
commit5f4c4df227025c6b6156ce8238b56553dca4b5ae (patch)
treeb090b809346ba8e39db1e08ca24933e64dae8ab9 /OpenSim/Tools
parentBulletSim: new algorithm for vertical attraction which uses quaternion (diff)
downloadopensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.zip
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.gz
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.bz2
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.xz
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r--OpenSim/Tools/pCampBot/Bot.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index daaa3c0..9821180 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using pCampBot.Interfaces; 41using pCampBot.Interfaces;
42using Timer = System.Timers.Timer; 42using Timer = System.Timers.Timer;
43using PermissionMask = OpenSim.Framework.PermissionMask;
43 44
44namespace pCampBot 45namespace pCampBot
45{ 46{
@@ -362,7 +363,7 @@ namespace pCampBot
362 asset.Encode(); 363 asset.Encode();
363 transid = Client.Assets.RequestUpload(asset,true); 364 transid = Client.Assets.RequestUpload(asset,true);
364 Client.Inventory.RequestCreateItem(clothfolder.UUID, "MyClothing" + i.ToString(), "MyClothing", AssetType.Clothing, 365 Client.Inventory.RequestCreateItem(clothfolder.UUID, "MyClothing" + i.ToString(), "MyClothing", AssetType.Clothing,
365 transid, InventoryType.Wearable, asset.WearableType, PermissionMask.All, delegate(bool success, InventoryItem item) 366 transid, InventoryType.Wearable, asset.WearableType, (OpenMetaverse.PermissionMask)PermissionMask.All, delegate(bool success, InventoryItem item)
366 { 367 {
367 if (success) 368 if (success)
368 { 369 {
@@ -386,7 +387,7 @@ namespace pCampBot
386 asset.Encode(); 387 asset.Encode();
387 transid = Client.Assets.RequestUpload(asset,true); 388 transid = Client.Assets.RequestUpload(asset,true);
388 Client.Inventory.RequestCreateItem(clothfolder.UUID, "MyBodyPart" + i.ToString(), "MyBodyPart", AssetType.Bodypart, 389 Client.Inventory.RequestCreateItem(clothfolder.UUID, "MyBodyPart" + i.ToString(), "MyBodyPart", AssetType.Bodypart,
389 transid, InventoryType.Wearable, asset.WearableType, PermissionMask.All, delegate(bool success, InventoryItem item) 390 transid, InventoryType.Wearable, asset.WearableType, (OpenMetaverse.PermissionMask)PermissionMask.All, delegate(bool success, InventoryItem item)
390 { 391 {
391 if (success) 392 if (success)
392 { 393 {