diff options
| author | Melanie | 2013-06-30 18:27:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-30 18:27:30 +0100 |
| commit | ffcee82b1d62150b772464841023a29acc334c84 (patch) | |
| tree | 957d562be1f9e567daabb9bfdd25e779ec2c11a4 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Groups V2: charge for group creation only after the group has been successful... (diff) | |
| download | opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.zip opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.gz opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2 opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 | bin | 0 -> 11276 bytes | |||
| -rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 12 |
2 files changed, 12 insertions, 0 deletions
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..a29ac38 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
| @@ -746,4 +746,16 @@ | |||
| 746 | <Key Name="assetType" Value="0" /> | 746 | <Key Name="assetType" Value="0" /> |
| 747 | <Key Name="fileName" Value="735198cf-6ea0-2550-e222-21d3c6a341ae.j2c" /> | 747 | <Key Name="fileName" Value="735198cf-6ea0-2550-e222-21d3c6a341ae.j2c" /> |
| 748 | </Section> | 748 | </Section> |
| 749 | |||
| 750 | <!-- | ||
| 751 | Texture expected by viewers for properly displaying stars in the night sky | ||
| 752 | Name derives from label in viewer code | ||
| 753 | --> | ||
| 754 | <Section Name="IMG_BLOOM1 Texture"> | ||
| 755 | <Key Name="assetID" Value="3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"/> | ||
| 756 | <Key Name="name" Value="IMG_BLOOM1 Texture"/> | ||
| 757 | <Key Name="assetType" Value="0" /> | ||
| 758 | <Key Name="fileName" Value="IMG_BLOOM1.jp2" /> | ||
| 759 | </Section> | ||
| 760 | |||
| 749 | </Nini> | 761 | </Nini> |