diff options
Diffstat (limited to 'OpenSim')
4 files changed, 11 insertions, 10 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"); |
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index a78e093..6c18d06 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -95,9 +95,8 @@ namespace OpenSim.Framework.Communications.Tests | |||
95 | responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); | 95 | responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); |
96 | 96 | ||
97 | Regex capsSeedPattern | 97 | Regex capsSeedPattern |
98 | = new Regex("^http://" | 98 | = new Regex("^http://" + regionExternalName + ":" + NetworkServersInfo.DefaultHttpListenerPort |
99 | + regionExternalName | 99 | + "/CAPS/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{8}0000/$"); |
100 | + ":9000/CAPS/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{8}0000/$"); | ||
101 | 100 | ||
102 | Assert.That(capsSeedPattern.IsMatch((string)responseData["seed_capability"]), Is.True); | 101 | Assert.That(capsSeedPattern.IsMatch((string)responseData["seed_capability"]), Is.True); |
103 | } | 102 | } |
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 4cc7134..396996a 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Framework | |||
51 | /// </summary> | 51 | /// </summary> |
52 | public class Util | 52 | public class Util |
53 | { | 53 | { |
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private static uint nextXferID = 5000; | 56 | private static uint nextXferID = 5000; |
57 | private static Random randomClass = new Random(); | 57 | private static Random randomClass = new Random(); |
@@ -66,6 +66,11 @@ namespace OpenSim.Framework | |||
66 | 66 | ||
67 | public static readonly Regex UUIDPattern | 67 | public static readonly Regex UUIDPattern |
68 | = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); | 68 | = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); |
69 | |||
70 | /// <value> | ||
71 | /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) | ||
72 | /// </value> | ||
73 | public static UUID BLANK_TEXTURE_UUID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); | ||
69 | 74 | ||
70 | #region Vector Equations | 75 | #region Vector Equations |
71 | 76 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs index ff8d0b9..c5efb4f 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs | |||
@@ -129,7 +129,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
129 | private static readonly Color defaultColor3 = Color.FromArgb(162, 154, 141); | 129 | private static readonly Color defaultColor3 = Color.FromArgb(162, 154, 141); |
130 | private static readonly UUID defaultTerrainTexture4 = new UUID("53a2f406-4895-1d13-d541-d2e3b86bc19c"); | 130 | private static readonly UUID defaultTerrainTexture4 = new UUID("53a2f406-4895-1d13-d541-d2e3b86bc19c"); |
131 | private static readonly Color defaultColor4 = Color.FromArgb(200, 200, 200); | 131 | private static readonly Color defaultColor4 = Color.FromArgb(200, 200, 200); |
132 | private static readonly UUID blankTerrainTexture = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); | ||
133 | 132 | ||
134 | #endregion | 133 | #endregion |
135 | 134 | ||
@@ -153,7 +152,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
153 | m_mapping.Add(defaultTerrainTexture2, defaultColor2); | 152 | m_mapping.Add(defaultTerrainTexture2, defaultColor2); |
154 | m_mapping.Add(defaultTerrainTexture3, defaultColor3); | 153 | m_mapping.Add(defaultTerrainTexture3, defaultColor3); |
155 | m_mapping.Add(defaultTerrainTexture4, defaultColor4); | 154 | m_mapping.Add(defaultTerrainTexture4, defaultColor4); |
156 | m_mapping.Add(blankTerrainTexture, Color.White); | 155 | m_mapping.Add(Util.BLANK_TEXTURE_UUID, Color.White); |
157 | } | 156 | } |
158 | 157 | ||
159 | #region Helpers | 158 | #region Helpers |