Merge branch 'master' into diva-textures

author: Melanie 2009-10-02 08:23:38 +0100
committer: Melanie 2009-10-02 08:23:38 +0100
commit: 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch)
tree: a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Framework/AvatarWearable.cs
parent: Restore the missing image handling to the image manager. The missing (diff)
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 5071594..4a5253c 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
                
                // Body
                defaultWearables[0].ItemID  = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
-                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");                
+                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
                // Skin
                defaultWearables[1].ItemID  = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
author	Melanie	2009-10-02 08:23:38 +0100
committer	Melanie	2009-10-02 08:23:38 +0100
commit	31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch)
tree	a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Framework/AvatarWearable.cs
parent	Restore the missing image handling to the image manager. The missing (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz

diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs index 5071594..4a5253c 100644 --- a/OpenSim/Framework/AvatarWearable.cs +++ b/OpenSim/Framework/AvatarWearable.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
59		59
60	// Body	60	// Body
61	defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");	61	defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
62	defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");	62	defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
63		63
64	// Skin	64	// Skin
65	defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");	65	defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");