aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs8
-rw-r--r--bin/assets/TexturesAssetSet/TexturesAssetSet.xml14
-rw-r--r--bin/assets/TexturesAssetSet/default_clear.jp2bin0 -> 328 bytes
-rw-r--r--bin/assets/TexturesAssetSet/default_media.jp2bin0 -> 308 bytes
-rw-r--r--bin/inventory/TexturesLibrary/TexturesLibraryItems.xml28
5 files changed, 50 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 18bf82f..5969a43 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -507,5 +507,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
507 public const int TOUCH_INVALID_FACE = -1; 507 public const int TOUCH_INVALID_FACE = -1;
508 public static readonly vector TOUCH_INVALID_TEXCOORD = new vector(-1.0, -1.0, 0.0); 508 public static readonly vector TOUCH_INVALID_TEXCOORD = new vector(-1.0, -1.0, 0.0);
509 public static readonly vector TOUCH_INVALID_VECTOR = ZERO_VECTOR; 509 public static readonly vector TOUCH_INVALID_VECTOR = ZERO_VECTOR;
510
511 // Constants for default textures
512 public const string TEXTURE_BLANK = "5748decc-f629-461c-9a36-a35a221fe21f";
513 public const string TEXTURE_DEFAULT = "89556747-24cb-43ed-920b-47caed15465f";
514 public const string TEXTURE_PLYWOOD = "89556747-24cb-43ed-920b-47caed15465f";
515 public const string TEXTURE_TRANSPARENT = "8dcd4a48-2d37-4909-9f78-f7a9eb4ef903";
516 public const string TEXTURE_MEDIA = "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361";
517
510 } 518 }
511} 519}
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index f006c98..0352c99 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -387,4 +387,18 @@
387 <Key Name="assetType" Value="0" /> 387 <Key Name="assetType" Value="0" />
388 <Key Name="fileName" Value="blank.jpc" /> 388 <Key Name="fileName" Value="blank.jpc" />
389 </Section> 389 </Section>
390
391 <Section Name="Default Media Texture">
392 <Key Name="assetID" Value="8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"/>
393 <Key Name="name" Value="Default Media Texture"/>
394 <Key Name="assetType" Value="0" />
395 <Key Name="fileName" Value="default_media.jp2" />
396 </Section>
397
398 <Section Name="Default Transparent Texture">
399 <Key Name="assetID" Value="8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"/>
400 <Key Name="name" Value="Default Transparent Texture"/>
401 <Key Name="assetType" Value="0" />
402 <Key Name="fileName" Value="default_clear.jp2" />
403 </Section>
390</Nini> 404</Nini>
diff --git a/bin/assets/TexturesAssetSet/default_clear.jp2 b/bin/assets/TexturesAssetSet/default_clear.jp2
new file mode 100644
index 0000000..078edd8
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/default_clear.jp2
Binary files differ
diff --git a/bin/assets/TexturesAssetSet/default_media.jp2 b/bin/assets/TexturesAssetSet/default_media.jp2
new file mode 100644
index 0000000..77e74e3
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/default_media.jp2
Binary files differ
diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
index 85ba073..31044b0 100644
--- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
+++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
@@ -720,4 +720,32 @@
720 <Key Name="everyonePermissions" Value="2147483647" /> 720 <Key Name="everyonePermissions" Value="2147483647" />
721 <Key Name="basePermissions" Value="2147483647" /> 721 <Key Name="basePermissions" Value="2147483647" />
722 </Section> 722 </Section>
723
724 <Section Name="Default Media Texture">
725 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000011"/>
726 <Key Name="assetID" Value="8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"/>
727 <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
728 <Key Name="description" Value="" />
729 <Key Name="name" Value="Default Media Texture" />
730 <Key Name="assetType" Value="0" />
731 <Key Name="inventoryType" Value="0" />
732 <Key Name="currentPermissions" Value="2147483647" />
733 <Key Name="nextPermissions" Value="2147483647" />
734 <Key Name="everyonePermissions" Value="2147483647" />
735 <Key Name="basePermissions" Value="2147483647" />
736 </Section>
737
738 <Section Name="Default Transparent Texture">
739 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000012"/>
740 <Key Name="assetID" Value="8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"/>
741 <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
742 <Key Name="description" Value="" />
743 <Key Name="name" Value="Default Transparent Texture" />
744 <Key Name="assetType" Value="0" />
745 <Key Name="inventoryType" Value="0" />
746 <Key Name="currentPermissions" Value="2147483647" />
747 <Key Name="nextPermissions" Value="2147483647" />
748 <Key Name="everyonePermissions" Value="2147483647" />
749 <Key Name="basePermissions" Value="2147483647" />
750 </Section>
723</Nini> 751</Nini>