diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /bin/assets | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'bin/assets')
-rw-r--r-- | bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml | 6 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 | bin | 0 -> 11276 bytes | |||
-rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 18 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/femalehair.jp2 | bin | 0 -> 131038 bytes |
4 files changed, 21 insertions, 3 deletions
diff --git a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml index c76cb78..eae9642 100644 --- a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml +++ b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml | |||
@@ -89,9 +89,9 @@ | |||
89 | <Key Name="assetType" Value="10" /> | 89 | <Key Name="assetType" Value="10" /> |
90 | <Key Name="fileName" Value="llResetLandBanList.lsl" /> | 90 | <Key Name="fileName" Value="llResetLandBanList.lsl" /> |
91 | </Section> | 91 | </Section> |
92 | <Section Name="llResetLandPassList"> | 92 | <Section Name="llSay"> |
93 | <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> | 93 | <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> |
94 | <Key Name="name" Value="llResetLandPassList" /> | 94 | <Key Name="name" Value="llSay" /> |
95 | <Key Name="assetType" Value="10" /> | 95 | <Key Name="assetType" Value="10" /> |
96 | <Key Name="fileName" Value="llSay.lsl" /> | 96 | <Key Name="fileName" Value="llSay.lsl" /> |
97 | </Section> | 97 | </Section> |
@@ -240,4 +240,4 @@ | |||
240 | <Key Name="fileName" Value="KanEd-Test16.lsl" /> | 240 | <Key Name="fileName" Value="KanEd-Test16.lsl" /> |
241 | </Section> | 241 | </Section> |
242 | 242 | ||
243 | </Nini> \ No newline at end of file | 243 | </Nini> |
diff --git a/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 b/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 new file mode 100644 index 0000000..8186d49 --- /dev/null +++ b/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 | |||
Binary files differ | |||
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index a4a0cba..f7e4367 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
@@ -343,6 +343,12 @@ | |||
343 | <Key Name="assetType" Value="0" /> | 343 | <Key Name="assetType" Value="0" /> |
344 | <Key Name="fileName" Value="femaleface.jp2"/> | 344 | <Key Name="fileName" Value="femaleface.jp2"/> |
345 | </Section> | 345 | </Section> |
346 | <Section Name="Female Hair Texture"> | ||
347 | <Key Name="assetID" Value="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"/> | ||
348 | <Key Name="name" Value="Female Hair Texture"/> | ||
349 | <Key Name="assetType" Value="0" /> | ||
350 | <Key Name="fileName" Value="femalehair.jp2"/> | ||
351 | </Section> | ||
346 | <Section Name="Hyperlink Map Texture"> | 352 | <Section Name="Hyperlink Map Texture"> |
347 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000013"/> | 353 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000013"/> |
348 | <Key Name="name" Value="Hyperlink Map Texture"/> | 354 | <Key Name="name" Value="Hyperlink Map Texture"/> |
@@ -746,4 +752,16 @@ | |||
746 | <Key Name="assetType" Value="0" /> | 752 | <Key Name="assetType" Value="0" /> |
747 | <Key Name="fileName" Value="735198cf-6ea0-2550-e222-21d3c6a341ae.j2c" /> | 753 | <Key Name="fileName" Value="735198cf-6ea0-2550-e222-21d3c6a341ae.j2c" /> |
748 | </Section> | 754 | </Section> |
755 | |||
756 | <!-- | ||
757 | Texture expected by viewers for properly displaying stars in the night sky | ||
758 | Name derives from label in viewer code | ||
759 | --> | ||
760 | <Section Name="IMG_BLOOM1 Texture"> | ||
761 | <Key Name="assetID" Value="3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"/> | ||
762 | <Key Name="name" Value="IMG_BLOOM1 Texture"/> | ||
763 | <Key Name="assetType" Value="0" /> | ||
764 | <Key Name="fileName" Value="IMG_BLOOM1.jp2" /> | ||
765 | </Section> | ||
766 | |||
749 | </Nini> | 767 | </Nini> |
diff --git a/bin/assets/TexturesAssetSet/femalehair.jp2 b/bin/assets/TexturesAssetSet/femalehair.jp2 new file mode 100644 index 0000000..15a1f36 --- /dev/null +++ b/bin/assets/TexturesAssetSet/femalehair.jp2 | |||
Binary files differ | |||