From b5ac2eb1e1806a826d1c63608641cd7892d4e888 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 10 Mar 2015 01:04:04 +0100 Subject: Allow setting the size of the wearables array from config, for core compatibility --- OpenSim/Framework/AvatarWearable.cs | 2 +- OpenSim/Region/Application/OpenSim.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenSim') 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 // public static readonly int MAX_WEARABLES = 15; public static readonly int PHYSICS = 15; - public static readonly int MAX_WEARABLES = 16; + public static int MAX_WEARABLES = 16; 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 m_timeInterval = startupConfig.GetInt("timer_Interval", 1200); } + AvatarWearable.MAX_WEARABLES = startupConfig.GetInt("max_wearables", AvatarWearable.MAX_WEARABLES); string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty); FireAndForgetMethod asyncCallMethod; if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse(asyncCallMethodStr, out asyncCallMethod)) -- cgit v1.1