aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-28 05:36:28 +0000
committerTeravus Ovares2007-12-28 05:36:28 +0000
commit5bd5770ed2a5c2087a75489ed512ea59f7f25a1a (patch)
treee0041517433d012b22edac4cc76f145c01ba157b
parent* Added ability to create new prim on existing prim (rezzing prim from invent... (diff)
downloadopensim-SC_OLD-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.zip
opensim-SC_OLD-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.gz
opensim-SC_OLD-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.bz2
opensim-SC_OLD-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.
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs4
-rw-r--r--bin/OpenSimAssetSet.xml30
-rw-r--r--bin/OpenSimLibrary.xml12
-rw-r--r--bin/assets/bricks.jp2bin157424 -> 82167 bytes
-rw-r--r--bin/assets/granite.jp2bin130736 -> 82167 bytes
-rw-r--r--bin/assets/hardwood.jp2bin67673 -> 98231 bytes
-rw-r--r--bin/assets/plywood.jp2bin15720 -> 79234 bytes
-rw-r--r--bin/assets/rocks.jp2bin185594 -> 82167 bytes
9 files changed, 21 insertions, 29 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}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index e8ae2a7..dcb1a47 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3520,7 +3520,7 @@ namespace OpenSim.Region.ClientStack
3520 shape.PathTaperY = addPacket.ObjectData.PathTaperY; 3520 shape.PathTaperY = addPacket.ObjectData.PathTaperY;
3521 shape.PathTwist = addPacket.ObjectData.PathTwist; 3521 shape.PathTwist = addPacket.ObjectData.PathTwist;
3522 shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin; 3522 shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
3523 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")); 3523 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
3524 shape.Textures = ntex; 3524 shape.Textures = ntex;
3525 return shape; 3525 return shape;
3526 } 3526 }
@@ -3537,4 +3537,4 @@ namespace OpenSim.Region.ClientStack
3537 OutPacket(logReply, ThrottleOutPacketType.Task); 3537 OutPacket(logReply, ThrottleOutPacketType.Task);
3538 } 3538 }
3539 } 3539 }
3540} \ No newline at end of file 3540}
diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml
index 8d93035..21e298a 100644
--- a/bin/OpenSimAssetSet.xml
+++ b/bin/OpenSimAssetSet.xml
@@ -335,49 +335,41 @@
335 <Key Name="inventoryType" Value="0" /> 335 <Key Name="inventoryType" Value="0" />
336 <Key Name="fileName" Value="peaches.jp2" /> 336 <Key Name="fileName" Value="peaches.jp2" />
337 </Section> 337 </Section>
338 <!-- Copied from hardcoded values --> 338 <Section Name="bricks">
339 <Section Name="Bricks">
340 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> 339 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
341 <Key Name="name" Value="Bricks"/> 340 <Key Name="name" Value="bricks"/>
342 <Key Name="assetType" Value="0" /> 341 <Key Name="assetType" Value="0" />
343 <Key Name="inventoryType" Value="0" /> 342 <Key Name="inventoryType" Value="0" />
344 <Key Name="fileName" Value="bricks.jp2"/> 343 <Key Name="fileName" Value="bricks.jp2"/>
345 </Section> 344 </Section>
346 <Section Name="Plywood"> 345 <Section Name="plywood">
347 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/> 346 <Key Name="assetID" Value="89556747-24cb-43ed-920b-47caed15465f"/>
348 <Key Name="name" Value="Plywood"/> 347 <Key Name="name" Value="plywood"/>
349 <Key Name="assetType" Value="0" /> 348 <Key Name="assetType" Value="0" />
350 <Key Name="inventoryType" Value="0" /> 349 <Key Name="inventoryType" Value="0" />
351 <Key Name="fileName" Value="plywood.jp2"/> 350 <Key Name="fileName" Value="plywood.jp2"/>
352 </Section> 351 </Section>
353 <Section Name="Rocks"> 352 <Section Name="rocks">
354 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/> 353 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
355 <Key Name="name" Value="Rocks"/> 354 <Key Name="name" Value="rocks"/>
356 <Key Name="assetType" Value="0" /> 355 <Key Name="assetType" Value="0" />
357 <Key Name="inventoryType" Value="0" /> 356 <Key Name="inventoryType" Value="0" />
358 <Key Name="fileName" Value="rocks.jp2"/> 357 <Key Name="fileName" Value="rocks.jp2"/>
359 </Section> 358 </Section>
360 <Section Name="Granite"> 359 <Section Name="granite">
361 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/> 360 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
362 <Key Name="name" Value="Granite"/> 361 <Key Name="name" Value="granite"/>
363 <Key Name="assetType" Value="0" /> 362 <Key Name="assetType" Value="0" />
364 <Key Name="inventoryType" Value="0" /> 363 <Key Name="inventoryType" Value="0" />
365 <Key Name="fileName" Value="granite.jp2"/> 364 <Key Name="fileName" Value="granite.jp2"/>
366 </Section> 365 </Section>
367 <Section Name="Hardwood"> 366 <Section Name="hardwood">
368 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/> 367 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
369 <Key Name="name" Value="Hardwood"/> 368 <Key Name="name" Value="hardwood"/>
370 <Key Name="assetType" Value="0" /> 369 <Key Name="assetType" Value="0" />
371 <Key Name="inventoryType" Value="0" /> 370 <Key Name="inventoryType" Value="0" />
372 <Key Name="fileName" Value="hardwood.jp2"/> 371 <Key Name="fileName" Value="hardwood.jp2"/>
373 </Section> 372 </Section>
374 <Section Name="Prim Base Texture">
375 <Key Name="assetID" Value="00000000-0000-1111-5005-000000000005"/>
376 <Key Name="name" Value="Prim Base Texture"/>
377 <Key Name="assetType" Value="0" />
378 <Key Name="inventoryType" Value="0" />
379 <Key Name="fileName" Value="plywood.jp2"/>
380 </Section>
381 <Section Name="Map Base Texture"> 373 <Section Name="Map Base Texture">
382 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000006"/> 374 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000006"/>
383 <Key Name="name" Value="Map Base Texture"/> 375 <Key Name="name" Value="Map Base Texture"/>
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml
index d209635..3421a4a 100644
--- a/bin/OpenSimLibrary.xml
+++ b/bin/OpenSimLibrary.xml
@@ -540,7 +540,7 @@
540 <Key Name="basePermissions" Value="2147483647" /> 540 <Key Name="basePermissions" Value="2147483647" />
541 </Section> 541 </Section>
542 <Section Name="bricks Texture"> 542 <Section Name="bricks Texture">
543 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000001"/> 543 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000001"/>
544 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> 544 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
545 <Key Name="description" Value="bricks texture" /> 545 <Key Name="description" Value="bricks texture" />
546 <Key Name="name" Value="bricks" /> 546 <Key Name="name" Value="bricks" />
@@ -552,7 +552,7 @@
552 <Key Name="basePermissions" Value="2147483647" /> 552 <Key Name="basePermissions" Value="2147483647" />
553 </Section> 553 </Section>
554 <Section Name="granite Texture"> 554 <Section Name="granite Texture">
555 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000004"/> 555 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000004"/>
556 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/> 556 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
557 <Key Name="description" Value="granite texture" /> 557 <Key Name="description" Value="granite texture" />
558 <Key Name="name" Value="granite" /> 558 <Key Name="name" Value="granite" />
@@ -564,7 +564,7 @@
564 <Key Name="basePermissions" Value="2147483647" /> 564 <Key Name="basePermissions" Value="2147483647" />
565 </Section> 565 </Section>
566 <Section Name="hardwood Texture"> 566 <Section Name="hardwood Texture">
567 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000005"/> 567 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000005"/>
568 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/> 568 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
569 <Key Name="description" Value="hardwood texture" /> 569 <Key Name="description" Value="hardwood texture" />
570 <Key Name="name" Value="hardwood" /> 570 <Key Name="name" Value="hardwood" />
@@ -576,8 +576,8 @@
576 <Key Name="basePermissions" Value="2147483647" /> 576 <Key Name="basePermissions" Value="2147483647" />
577 </Section> 577 </Section>
578 <Section Name="plywood Texture"> 578 <Section Name="plywood Texture">
579 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000002"/> 579 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000002"/>
580 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/> 580 <Key Name="assetID" Value="89556747-24cb-43ed-920b-47caed15465f"/>
581 <Key Name="description" Value="plywood texture" /> 581 <Key Name="description" Value="plywood texture" />
582 <Key Name="name" Value="plywood" /> 582 <Key Name="name" Value="plywood" />
583 <Key Name="assetType" Value="0" /> 583 <Key Name="assetType" Value="0" />
@@ -588,7 +588,7 @@
588 <Key Name="basePermissions" Value="2147483647" /> 588 <Key Name="basePermissions" Value="2147483647" />
589 </Section> 589 </Section>
590 <Section Name="rocks Texture"> 590 <Section Name="rocks Texture">
591 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000003"/> 591 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000003"/>
592 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/> 592 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
593 <Key Name="description" Value="rocks texture" /> 593 <Key Name="description" Value="rocks texture" />
594 <Key Name="name" Value="rocks" /> 594 <Key Name="name" Value="rocks" />
diff --git a/bin/assets/bricks.jp2 b/bin/assets/bricks.jp2
index def093d..6113881 100644
--- a/bin/assets/bricks.jp2
+++ b/bin/assets/bricks.jp2
Binary files differ
diff --git a/bin/assets/granite.jp2 b/bin/assets/granite.jp2
index 8ecad58..6113881 100644
--- a/bin/assets/granite.jp2
+++ b/bin/assets/granite.jp2
Binary files differ
diff --git a/bin/assets/hardwood.jp2 b/bin/assets/hardwood.jp2
index 229424c..ff0fcce 100644
--- a/bin/assets/hardwood.jp2
+++ b/bin/assets/hardwood.jp2
Binary files differ
diff --git a/bin/assets/plywood.jp2 b/bin/assets/plywood.jp2
index 60365cc..2053675 100644
--- a/bin/assets/plywood.jp2
+++ b/bin/assets/plywood.jp2
Binary files differ
diff --git a/bin/assets/rocks.jp2 b/bin/assets/rocks.jp2
index 1e3dbfd..6113881 100644
--- a/bin/assets/rocks.jp2
+++ b/bin/assets/rocks.jp2
Binary files differ