diff options
-rw-r--r-- | OpenSim/Framework/AvatarWearable.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs index 271c90f..0ba4e65 100644 --- a/OpenSim/Framework/AvatarWearable.cs +++ b/OpenSim/Framework/AvatarWearable.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Framework | |||
70 | 70 | ||
71 | // public static readonly int MAX_WEARABLES = 15; | 71 | // public static readonly int MAX_WEARABLES = 15; |
72 | public static readonly int PHYSICS = 15; | 72 | public static readonly int PHYSICS = 15; |
73 | public static readonly int MAX_WEARABLES = 16; | 73 | public static int MAX_WEARABLES = 16; |
74 | 74 | ||
75 | 75 | ||
76 | public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9"); | 76 | public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9"); |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 369e79d..b9b9cd0 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -108,6 +108,7 @@ namespace OpenSim | |||
108 | m_timeInterval = startupConfig.GetInt("timer_Interval", 1200); | 108 | m_timeInterval = startupConfig.GetInt("timer_Interval", 1200); |
109 | } | 109 | } |
110 | 110 | ||
111 | AvatarWearable.MAX_WEARABLES = startupConfig.GetInt("max_wearables", AvatarWearable.MAX_WEARABLES); | ||
111 | string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty); | 112 | string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty); |
112 | FireAndForgetMethod asyncCallMethod; | 113 | FireAndForgetMethod asyncCallMethod; |
113 | if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod)) | 114 | if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod)) |