diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs | 33 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 |
2 files changed, 33 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..8ad948c --- /dev/null +++ b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs | |||
@@ -0,0 +1,33 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("OpenSim.ApplicationPlugins.RemoteController")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("http://opensimulator.org")] | ||
12 | [assembly: AssemblyProduct("OpenSim")] | ||
13 | [assembly: AssemblyCopyright("Copyright OpenSimulator developers © 2012")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("efec6e69-fc4a-4e21-86e6-4a261c12d4db")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | [assembly: AssemblyVersion("0.7.5.*")] | ||
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
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); |