OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement missing LSL TEXTURE_xxx constants including two new textures. 

Fixes Mantis #3030
0.6.3-post-fixes
idb 2009-01-22 23:58:46 +00:00
parent 884009ed33
commit 757762a630
5 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@ -507,5 +507,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int TOUCH_INVALID_FACE = -1; 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_TEXCOORD = new vector(-1.0, -1.0, 0.0);
public static readonly vector TOUCH_INVALID_VECTOR = ZERO_VECTOR; 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";
} }
} }

14
bin/assets/TexturesAssetSet/TexturesAssetSet.xml
View File

@ -387,4 +387,18 @@
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="blank.jpc" /> <Key Name="fileName" Value="blank.jpc" />
</Section> </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> </Nini>

BIN
bin/assets/TexturesAssetSet/default_clear.jp2 Normal file
View File

Binary file not shown.

BIN
bin/assets/TexturesAssetSet/default_media.jp2 Normal file
View File

Binary file not shown.

28
bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
View File

@ -720,4 +720,32 @@
<Key Name="everyonePermissions" Value="2147483647" /> <Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" /> <Key Name="basePermissions" Value="2147483647" />
</Section> </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> </Nini>