diff options
| author | Melanie | 2012-09-07 19:49:46 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-07 19:49:46 +0100 |
| commit | 924df14c5e15185e14c144164dd80d9859d5c583 (patch) | |
| tree | 110f0e402b879f49943ff2e76598e2241e20057c /bin/OpenSimDefaults.ini | |
| parent | Revert "made setting rotation match Second Life" (diff) | |
| parent | Move addin attributes to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 2843e12..aa3b1a1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -703,6 +703,13 @@ | |||
| 703 | ; Default is false. | 703 | ; Default is false. |
| 704 | ReuseDynamicTextures = false | 704 | ReuseDynamicTextures = false |
| 705 | 705 | ||
| 706 | ; If true, then textures generated dynamically that have a low data size relative to their pixel size are not reused | ||
| 707 | ; This is to workaround an apparent LL 3.3.4 and earlier viewer bug where such textures are not redisplayed properly when pulled from the viewer cache. | ||
| 708 | ; Only set this to true if you are sure that all the viewers using your simulator will not suffer from this problem. | ||
| 709 | ; This setting only has an affect is ReuseDynamicTextures = true | ||
| 710 | ; Default is false | ||
| 711 | ReuseDynamicLowDataTextures = false | ||
| 712 | |||
| 706 | 713 | ||
| 707 | [ODEPhysicsSettings] | 714 | [ODEPhysicsSettings] |
| 708 | ; ## | 715 | ; ## |