aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-09 00:29:59 +0100
committerJustin Clark-Casey (justincc)2011-09-09 00:38:04 +0100
commit086bf9f15db05ca2be1cf0dda24f8ee7a368988d (patch)
tree54cf631d998183bb893e644fd4daf1e49bd11b3e /OpenSim/Capabilities/Handlers
parentFix test failure. Oversight in setting up the tests themselves. (diff)
downloadopensim-SC-086bf9f15db05ca2be1cf0dda24f8ee7a368988d.zip
opensim-SC-086bf9f15db05ca2be1cf0dda24f8ee7a368988d.tar.gz
opensim-SC-086bf9f15db05ca2be1cf0dda24f8ee7a368988d.tar.bz2
opensim-SC-086bf9f15db05ca2be1cf0dda24f8ee7a368988d.tar.xz
Save the default terrain texture UUIDs for a new region instead of leaving them as UUID.Zero.
Leaving them at UUID.Zero meant that when a viewer 2 logged into a region that had been freshly created, it received UUID.Zero for these textures, and hence display the land as plain white. On a simulator restart, the problem would go away since when the database adapators loaded the new region settings, RegionSettings itself has code to use default textures instead of UUID.Zero. This commit resolves the problem by saving the default texture UUIDs instead of Zero. However, we currently have to do this in a roundabout way by resaving once the RegionSettings have been created by the database for the first time. This needless complexity should be addressed. This change will also have the effect of replacing any existing UUID.Zero terrain textures with the default ones. However, this shouldn't have any effect since the UUID.Zeros were already being replaced in memory with those same UUIDs.
Diffstat (limited to 'OpenSim/Capabilities/Handlers')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 105a1e0..e1b4fe7 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -47,7 +47,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
47 47
48namespace OpenSim.Capabilities.Handlers 48namespace OpenSim.Capabilities.Handlers
49{ 49{
50
51 public class GetTextureHandler : BaseStreamHandler 50 public class GetTextureHandler : BaseStreamHandler
52 { 51 {
53 private static readonly ILog m_log = 52 private static readonly ILog m_log =
@@ -67,7 +66,6 @@ namespace OpenSim.Capabilities.Handlers
67 66
68 public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) 67 public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
69 { 68 {
70
71 // Try to parse the texture ID from the request URL 69 // Try to parse the texture ID from the request URL
72 NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); 70 NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
73 string textureStr = query.GetOne("texture_id"); 71 string textureStr = query.GetOne("texture_id");
@@ -85,6 +83,8 @@ namespace OpenSim.Capabilities.Handlers
85 UUID textureID; 83 UUID textureID;
86 if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out textureID)) 84 if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out textureID))
87 { 85 {
86// m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID);
87
88 string[] formats; 88 string[] formats;
89 if (format != null && format != string.Empty) 89 if (format != null && format != string.Empty)
90 { 90 {
@@ -105,7 +105,6 @@ namespace OpenSim.Capabilities.Handlers
105 if (FetchTexture(httpRequest, httpResponse, textureID, f)) 105 if (FetchTexture(httpRequest, httpResponse, textureID, f))
106 break; 106 break;
107 } 107 }
108
109 } 108 }
110 else 109 else
111 { 110 {