aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-17 01:23:29 +0000
committerJustin Clark-Casey (justincc)2012-11-17 01:23:29 +0000
commit392e84e55402166f5b4ec708d3338efe70a94c2e (patch)
treed7ebe51bd7c8364595892cda4491c72cb82c5555 /OpenSim/ApplicationPlugins/RemoteController
parentDo not allow invariants to change on calls to XInventoryService.UpdateItem() (diff)
downloadopensim-SC-392e84e55402166f5b4ec708d3338efe70a94c2e.zip
opensim-SC-392e84e55402166f5b4ec708d3338efe70a94c2e.tar.gz
opensim-SC-392e84e55402166f5b4ec708d3338efe70a94c2e.tar.bz2
opensim-SC-392e84e55402166f5b4ec708d3338efe70a94c2e.tar.xz
Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid
This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 15fbddd..a75d10d 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -2314,7 +2314,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2314 destinationItem.Description = item.Description; 2314 destinationItem.Description = item.Description;
2315 destinationItem.InvType = item.InvType; 2315 destinationItem.InvType = item.InvType;
2316 destinationItem.CreatorId = item.CreatorId; 2316 destinationItem.CreatorId = item.CreatorId;
2317 destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
2318 destinationItem.CreatorData = item.CreatorData; 2317 destinationItem.CreatorData = item.CreatorData;
2319 destinationItem.NextPermissions = item.NextPermissions; 2318 destinationItem.NextPermissions = item.NextPermissions;
2320 destinationItem.CurrentPermissions = item.CurrentPermissions; 2319 destinationItem.CurrentPermissions = item.CurrentPermissions;
@@ -2369,7 +2368,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2369 destinationItem.Description = item.Description; 2368 destinationItem.Description = item.Description;
2370 destinationItem.InvType = item.InvType; 2369 destinationItem.InvType = item.InvType;
2371 destinationItem.CreatorId = item.CreatorId; 2370 destinationItem.CreatorId = item.CreatorId;
2372 destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
2373 destinationItem.CreatorData = item.CreatorData; 2371 destinationItem.CreatorData = item.CreatorData;
2374 destinationItem.NextPermissions = item.NextPermissions; 2372 destinationItem.NextPermissions = item.NextPermissions;
2375 destinationItem.CurrentPermissions = item.CurrentPermissions; 2373 destinationItem.CurrentPermissions = item.CurrentPermissions;
@@ -2482,7 +2480,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2482 destinationItem.Description = item.Description; 2480 destinationItem.Description = item.Description;
2483 destinationItem.InvType = item.InvType; 2481 destinationItem.InvType = item.InvType;
2484 destinationItem.CreatorId = item.CreatorId; 2482 destinationItem.CreatorId = item.CreatorId;
2485 destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
2486 destinationItem.CreatorData = item.CreatorData; 2483 destinationItem.CreatorData = item.CreatorData;
2487 destinationItem.NextPermissions = item.NextPermissions; 2484 destinationItem.NextPermissions = item.NextPermissions;
2488 destinationItem.CurrentPermissions = item.CurrentPermissions; 2485 destinationItem.CurrentPermissions = item.CurrentPermissions;
@@ -2788,7 +2785,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2788 inventoryItem.Description = GetStringAttribute(item,"desc",""); 2785 inventoryItem.Description = GetStringAttribute(item,"desc","");
2789 inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1); 2786 inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1);
2790 inventoryItem.CreatorId = GetStringAttribute(item,"creatorid",""); 2787 inventoryItem.CreatorId = GetStringAttribute(item,"creatorid","");
2791 inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid","");
2792 inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", ""); 2788 inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", "");
2793 inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff); 2789 inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff);
2794 inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff); 2790 inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff);