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 @@ + +
+ + + + +
+ +
+ + + + +
diff --git a/bin/assets/TexturesAssetSet/default_clear.jp2 b/bin/assets/TexturesAssetSet/default_clear.jp2 new file mode 100644 index 0000000000..078edd8b1d Binary files /dev/null and b/bin/assets/TexturesAssetSet/default_clear.jp2 differ diff --git a/bin/assets/TexturesAssetSet/default_media.jp2 b/bin/assets/TexturesAssetSet/default_media.jp2 new file mode 100644 index 0000000000..77e74e33c8 Binary files /dev/null and b/bin/assets/TexturesAssetSet/default_media.jp2 differ 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 @@ + +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + +