aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMic Bowman2010-12-27 12:43:54 -0800
committerMic Bowman2010-12-27 12:43:54 -0800
commitb16173e3e884407bbb5ea686a2cf3294572add0e (patch)
tree9d330d126c8dcb98d3a73b5e99cd3720b9eb619a /OpenSim/Framework
parentFixes mantis #5279 (diff)
downloadopensim-SC_OLD-b16173e3e884407bbb5ea686a2cf3294572add0e.zip
opensim-SC_OLD-b16173e3e884407bbb5ea686a2cf3294572add0e.tar.gz
opensim-SC_OLD-b16173e3e884407bbb5ea686a2cf3294572add0e.tar.bz2
opensim-SC_OLD-b16173e3e884407bbb5ea686a2cf3294572add0e.tar.xz
Drop the static from default wearables. It isn't
static.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarWearable.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 0809ab6..8e27596 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -88,8 +88,6 @@ namespace OpenSim.Framework
88// public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1"); 88// public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1");
89// public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007"); 89// public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007");
90 90
91 private static AvatarWearable[] defaultWearables = null;
92
93 protected Dictionary<UUID, UUID> m_items = new Dictionary<UUID, UUID>(); 91 protected Dictionary<UUID, UUID> m_items = new Dictionary<UUID, UUID>();
94 protected List<UUID> m_ids = new List<UUID>(); 92 protected List<UUID> m_ids = new List<UUID>();
95 93
@@ -221,7 +219,7 @@ namespace OpenSim.Framework
221 { 219 {
222 get 220 get
223 { 221 {
224 defaultWearables = new AvatarWearable[MAX_WEARABLES]; //should be 15 of these 222 AvatarWearable[] defaultWearables = new AvatarWearable[MAX_WEARABLES]; //should be 15 of these
225 for (int i = 0; i < MAX_WEARABLES; i++) 223 for (int i = 0; i < MAX_WEARABLES; i++)
226 { 224 {
227 defaultWearables[i] = new AvatarWearable(); 225 defaultWearables[i] = new AvatarWearable();