diff options
author | Justin Clarke Casey | 2009-01-05 19:36:48 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-05 19:36:48 +0000 |
commit | e7ac639f3a8a05858df03a8b5fd611826a56ae97 (patch) | |
tree | 926414fc9cdb51eeec3239d2c558110f7ea27f8b /OpenSim/Framework/AvatarAppearance.cs | |
parent | * add the required System.xml reference as well (diff) | |
download | opensim-SC_OLD-e7ac639f3a8a05858df03a8b5fd611826a56ae97.zip opensim-SC_OLD-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.gz opensim-SC_OLD-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.bz2 opensim-SC_OLD-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.xz |
* Centralize references to the well known blank texture 5748decc-f629-461c-9a36-a35a221fe21f to a constant in OpenSim.Framework.Util
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 224e9a3..ad95f78 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -298,8 +298,8 @@ namespace OpenSim.Framework | |||
298 | { | 298 | { |
299 | Primitive.TextureEntry textu = new Primitive.TextureEntry(new UUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); | 299 | Primitive.TextureEntry textu = new Primitive.TextureEntry(new UUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); |
300 | textu.CreateFace(0).TextureID = new UUID("00000000-0000-1111-9999-000000000012"); | 300 | textu.CreateFace(0).TextureID = new UUID("00000000-0000-1111-9999-000000000012"); |
301 | textu.CreateFace(1).TextureID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); | 301 | textu.CreateFace(1).TextureID = Util.BLANK_TEXTURE_UUID; |
302 | textu.CreateFace(2).TextureID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); | 302 | textu.CreateFace(2).TextureID = Util.BLANK_TEXTURE_UUID; |
303 | textu.CreateFace(3).TextureID = new UUID("6522E74D-1660-4E7F-B601-6F48C1659A77"); | 303 | textu.CreateFace(3).TextureID = new UUID("6522E74D-1660-4E7F-B601-6F48C1659A77"); |
304 | textu.CreateFace(4).TextureID = new UUID("7CA39B4C-BD19-4699-AFF7-F93FD03D3E7B"); | 304 | textu.CreateFace(4).TextureID = new UUID("7CA39B4C-BD19-4699-AFF7-F93FD03D3E7B"); |
305 | textu.CreateFace(5).TextureID = new UUID("00000000-0000-1111-9999-000000000010"); | 305 | textu.CreateFace(5).TextureID = new UUID("00000000-0000-1111-9999-000000000010"); |
@@ -319,8 +319,6 @@ namespace OpenSim.Framework | |||
319 | 319 | ||
320 | protected AvatarAppearance(SerializationInfo info, StreamingContext context) | 320 | protected AvatarAppearance(SerializationInfo info, StreamingContext context) |
321 | { | 321 | { |
322 | //System.Console.WriteLine("AvatarAppearance Deserialize BGN"); | ||
323 | |||
324 | if (info == null) | 322 | if (info == null) |
325 | { | 323 | { |
326 | throw new ArgumentNullException("info"); | 324 | throw new ArgumentNullException("info"); |