diff options
author | Melanie | 2010-10-29 21:22:35 +0100 |
---|---|---|
committer | Melanie | 2010-10-29 21:22:35 +0100 |
commit | 69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e (patch) | |
tree | 2a046b787abced2a1e68b1e62831e0b4f3778323 /bin | |
parent | Add my work on top of cmickeyb's (diff) | |
parent | Rename the new default texture to be consistent with the others (diff) | |
download | opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.zip opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.gz opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.bz2 opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSimDefaults.ini | 14 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 2 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/default_alpha.jp2 | bin | 0 -> 319 bytes |
3 files changed, 15 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 82267ed..5ced7d5 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -255,6 +255,20 @@ | |||
255 | ; OpenJPEG if false | 255 | ; OpenJPEG if false |
256 | ; UseCSJ2K = true | 256 | ; UseCSJ2K = true |
257 | 257 | ||
258 | ; Persist avatar baked textures | ||
259 | ; Persisting baked textures can speed up login and region border | ||
260 | ; crossings especially with large numbers of users, though it | ||
261 | ; will store potentially large numbers of textures in your asset | ||
262 | ; database | ||
263 | PersistBakedTextures = false | ||
264 | |||
265 | ; Control the delay before appearance is sent to other avatars and | ||
266 | ; saved in the avatar service. Attempts to limit the impact caused | ||
267 | ; by the very chatty dialog that sets appearance when an avatar | ||
268 | ; logs in or teleports into a region; values are in seconds | ||
269 | DelayBeforeAppearanceSave = 5 | ||
270 | DelayBeforeAppearanceSend = 2 | ||
271 | |||
258 | [SMTP] | 272 | [SMTP] |
259 | enabled=false | 273 | enabled=false |
260 | 274 | ||
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index 7c74a48..5484ee2 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
@@ -3,7 +3,7 @@ | |||
3 | <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" /> | 3 | <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" /> |
4 | <Key Name="name" Value="alpha" /> | 4 | <Key Name="name" Value="alpha" /> |
5 | <Key Name="assetType" Value="0" /> | 5 | <Key Name="assetType" Value="0" /> |
6 | <Key Name="fileName" Value="defaultalpha.jp2" /> | 6 | <Key Name="fileName" Value="default_alpha.jp2" /> |
7 | </Section> | 7 | </Section> |
8 | <Section Name="texture1"> | 8 | <Section Name="texture1"> |
9 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> | 9 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> |
diff --git a/bin/assets/TexturesAssetSet/default_alpha.jp2 b/bin/assets/TexturesAssetSet/default_alpha.jp2 new file mode 100644 index 0000000..af73c1e --- /dev/null +++ b/bin/assets/TexturesAssetSet/default_alpha.jp2 | |||
Binary files differ | |||