diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index aa222bb..853b004 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -27,18 +27,18 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | ||
31 | using System.Globalization; | ||
30 | using System.IO; | 32 | using System.IO; |
31 | using System.Threading; | 33 | using System.Threading; |
32 | using System.Xml; | ||
33 | using System.Drawing; | ||
34 | using System.Timers; | 34 | using System.Timers; |
35 | using OpenSim.Framework; | 35 | using System.Xml; |
36 | using OpenSim.Framework.Servers; | ||
37 | using OpenSim.Framework.Communications; | ||
38 | using OpenSim.Framework.Communications.Cache; | ||
39 | using OpenMetaverse; | 36 | using OpenMetaverse; |
40 | using OpenMetaverse.Imaging; | 37 | using OpenMetaverse.Imaging; |
41 | using Nini.Config; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications.Cache; | ||
40 | using OpenSim.Framework.Servers; | ||
41 | using Timer=System.Timers.Timer; | ||
42 | 42 | ||
43 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 43 | namespace OpenSim.ApplicationPlugins.Rest.Inventory |
44 | { | 44 | { |
@@ -1931,19 +1931,19 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1931 | switch (ic.xml.Name) | 1931 | switch (ic.xml.Name) |
1932 | { | 1932 | { |
1933 | case "current": | 1933 | case "current": |
1934 | ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); | 1934 | ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber); |
1935 | break; | 1935 | break; |
1936 | case "next": | 1936 | case "next": |
1937 | ic.NextPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); | 1937 | ic.NextPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber); |
1938 | break; | 1938 | break; |
1939 | case "group": | 1939 | case "group": |
1940 | ic.GroupPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); | 1940 | ic.GroupPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber); |
1941 | break; | 1941 | break; |
1942 | case "everyone": | 1942 | case "everyone": |
1943 | ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); | 1943 | ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber); |
1944 | break; | 1944 | break; |
1945 | case "base": | 1945 | case "base": |
1946 | ic.BasePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); | 1946 | ic.BasePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber); |
1947 | break; | 1947 | break; |
1948 | default: | 1948 | default: |
1949 | Rest.Log.DebugFormat("{0} Permissions: invalid attribute {1}:{2}", | 1949 | Rest.Log.DebugFormat("{0} Permissions: invalid attribute {1}:{2}", |
@@ -2176,7 +2176,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2176 | internal UserProfileData userProfile = null; | 2176 | internal UserProfileData userProfile = null; |
2177 | internal InventoryFolderBase root = null; | 2177 | internal InventoryFolderBase root = null; |
2178 | internal bool timeout = false; | 2178 | internal bool timeout = false; |
2179 | internal System.Timers.Timer watchDog = new System.Timers.Timer(); | 2179 | internal Timer watchDog = new Timer(); |
2180 | 2180 | ||
2181 | internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix) | 2181 | internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix) |
2182 | : base(request, response, prefix) | 2182 | : base(request, response, prefix) |