From 757762a630274e2d3c9bf2bfb7ab2be625c50da0 Mon Sep 17 00:00:00 2001
From: idb <idb>
Date: Thu, 22 Jan 2009 23:58:46 +0000
Subject: [PATCH] Implement missing LSL TEXTURE_xxx constants including two new
 textures. Fixes Mantis #3030

---
 .../Shared/Api/Runtime/LSL_Constants.cs       |   8 +++++
 .../TexturesAssetSet/TexturesAssetSet.xml     |  14 +++++++++
 bin/assets/TexturesAssetSet/default_clear.jp2 | Bin 0 -> 328 bytes
 bin/assets/TexturesAssetSet/default_media.jp2 | Bin 0 -> 308 bytes
 .../TexturesLibrary/TexturesLibraryItems.xml  |  28 ++++++++++++++++++
 5 files changed, 50 insertions(+)
 create mode 100644 bin/assets/TexturesAssetSet/default_clear.jp2
 create mode 100644 bin/assets/TexturesAssetSet/default_media.jp2

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 18bf82f69e..5969a43329 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
         public const int TOUCH_INVALID_FACE = -1;
         public static readonly vector TOUCH_INVALID_TEXCOORD = new vector(-1.0, -1.0, 0.0);
         public static readonly vector TOUCH_INVALID_VECTOR = ZERO_VECTOR;
+
+        // Constants for default textures
+        public const string TEXTURE_BLANK = "5748decc-f629-461c-9a36-a35a221fe21f";
+        public const string TEXTURE_DEFAULT = "89556747-24cb-43ed-920b-47caed15465f";
+        public const string TEXTURE_PLYWOOD = "89556747-24cb-43ed-920b-47caed15465f";
+        public const string TEXTURE_TRANSPARENT = "8dcd4a48-2d37-4909-9f78-f7a9eb4ef903";
+        public const string TEXTURE_MEDIA = "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361";
+
     }
 }
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index f006c986ae..0352c99e60 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -387,4 +387,18 @@
     <Key Name="assetType" Value="0" />
     <Key Name="fileName" Value="blank.jpc" />
   </Section>
+
+  <Section Name="Default Media Texture">
+    <Key Name="assetID" Value="8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"/>
+    <Key Name="name" Value="Default Media Texture"/>
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="default_media.jp2" />
+  </Section>
+
+  <Section Name="Default Transparent Texture">
+    <Key Name="assetID" Value="8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"/>
+    <Key Name="name" Value="Default Transparent Texture"/>
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="default_clear.jp2" />
+  </Section>
 </Nini>
diff --git a/bin/assets/TexturesAssetSet/default_clear.jp2 b/bin/assets/TexturesAssetSet/default_clear.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..078edd8b1df958f490c12f4016cc6d69e1462a32
GIT binary patch
literal 328
zcmezG|38pHp8*6Kpcupkfd(iBu^AYc*%=uj=zkD{5F=24ft8t=fzj9{G_Ab+e++}L
zgM)`h05bZY!r;Wf=v<VVSdyBekW{JQAK(?1nOdG&q!6B&XKbXPtKeUdn&%bZ>aL(r
zmReMtnV+X%sAr^SpirJ!lA+)g5bpDT0s|M={$&h||AQI$85xmnjb#vF#IzQuj0s&C
i6Q;7s=a(o52866XKSKjZEoMI71ELo^Y9Jl_zX<^5++dCX

literal 0
HcmV?d00001

diff --git a/bin/assets/TexturesAssetSet/default_media.jp2 b/bin/assets/TexturesAssetSet/default_media.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..77e74e33c82cb51796021b7f072eab25ad6f9647
GIT binary patch
literal 308
zcmezG|38pHp8*6Kpcupkfd(iBu^AYc*%=uj=zkD{5F=24ft8t=fzj9{G_Ab+e++}L
zgM)`h05bZY!r;Wf=v<VVSdyBekW{JQAK(?1nOdG&q!6B&XKbXPtKeUdn&%bZ>aL(r
zmReMtnV+X%sAr^SpirJ!lA+)g5bpDT0s|M={z(js|AQI$85xmnjb#vF#IzQuj0s&C
N6Q;7s4P=4;HvtwdSYH4D

literal 0
HcmV?d00001

diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
index 85ba0734b2..31044b044e 100644
--- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
+++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
@@ -720,4 +720,32 @@
     <Key Name="everyonePermissions" Value="2147483647" />
     <Key Name="basePermissions" Value="2147483647" />
   </Section>
+
+  <Section Name="Default Media Texture">
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000011"/>
+    <Key Name="assetID" Value="8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"/>
+    <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Default Media Texture" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+    <Key Name="currentPermissions" Value="2147483647" />
+    <Key Name="nextPermissions" Value="2147483647" />
+    <Key Name="everyonePermissions" Value="2147483647" />
+    <Key Name="basePermissions" Value="2147483647" />
+  </Section>
+
+  <Section Name="Default Transparent Texture">
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000012"/>
+    <Key Name="assetID" Value="8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"/>
+    <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Default Transparent Texture" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+    <Key Name="currentPermissions" Value="2147483647" />
+    <Key Name="nextPermissions" Value="2147483647" />
+    <Key Name="everyonePermissions" Value="2147483647" />
+    <Key Name="basePermissions" Value="2147483647" />
+  </Section>
 </Nini>