diff options
| author | Melanie | 2010-02-22 03:00:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-22 03:00:59 +0000 |
| commit | 1f45e6c6497e05638f014e92098165befbbea100 (patch) | |
| tree | 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Framework/AvatarAppearance.cs | |
| parent | One more test running. (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.xz | |
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
| -rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index c0e9891..5da8ba1 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
| @@ -69,7 +69,7 @@ namespace OpenSim.Framework | |||
| 69 | private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66"); | 69 | private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66"); |
| 70 | private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66"); | 70 | private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66"); |
| 71 | 71 | ||
| 72 | public readonly static int VISUALPARAM_COUNT = 218; | 72 | public readonly static int VISUALPARAM_COUNT = 218; |
| 73 | 73 | ||
| 74 | protected UUID m_owner; | 74 | protected UUID m_owner; |
| 75 | 75 | ||
| @@ -361,7 +361,7 @@ namespace OpenSim.Framework | |||
| 361 | // This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist | 361 | // This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist |
| 362 | SetDefaultParams(m_visualparams); | 362 | SetDefaultParams(m_visualparams); |
| 363 | SetDefaultWearables(); | 363 | SetDefaultWearables(); |
| 364 | m_texture = GetDefaultTexture(); | 364 | m_texture = GetDefaultTexture(); |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams) | 367 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams) |