aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-28 05:36:28 +0000
committerTeravus Ovares2007-12-28 05:36:28 +0000
commit5bd5770ed2a5c2087a75489ed512ea59f7f25a1a (patch)
treee0041517433d012b22edac4cc76f145c01ba157b /OpenSim/Framework
parent* Added ability to create new prim on existing prim (rezzing prim from invent... (diff)
downloadopensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.zip
opensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.gz
opensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.bz2
opensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.xz
* Patch from Melanie. Thanks Melanie!
* This patch addresses a regression where 5 default textures, including the default "new prim" texture, would not be shown unless in viewer cache. * Further, it supplies a new plywood texture as the base texture, which is purpose-made from locally photo-sourced material (means i took a picture and made it into a tile), which is closer in appearance and color to the Linden one. * It changes the default new prim texture UUID to match the UUID generated by the viewer when "default" is clicked, which is a texture UUID hardcoded in some scripts as well, so it would cause compatibility issues if not addressed. * The patch fixes a number of UUID duplications (same UUID for asset and inventory items) and capitalization issues in the XML files. * It also includes new versions of 4 other textures, which were no longer loadable in grid mode.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index c29b973..66511e6 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Framework
140 static PrimitiveBaseShape() 140 static PrimitiveBaseShape()
141 { 141 {
142 m_defaultTexture = 142 m_defaultTexture =
143 new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")); 143 new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
144 } 144 }
145 145
146 public PrimitiveBaseShape() 146 public PrimitiveBaseShape()
@@ -238,4 +238,4 @@ namespace OpenSim.Framework
238 Scale.X = Scale.Y = radius*2f; 238 Scale.X = Scale.Y = radius*2f;
239 } 239 }
240 } 240 }
241} \ No newline at end of file 241}