diff options
| author | Diva Canto | 2012-04-27 09:26:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-04-27 09:26:14 -0700 |
| commit | 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch) | |
| tree | e4faab8dd2b55edff0632faf241c960ad553ccbc /bin | |
| parent | Minor change in error message (HG teleport failures) (diff) | |
| parent | Add regression test for teleporting an agent between separated regions on the... (diff) | |
| download | opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -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 3f2f131..cb9ef22 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -337,6 +337,13 @@ | |||
| 337 | ; OpenJPEG if false | 337 | ; OpenJPEG if false |
| 338 | ; UseCSJ2K = true | 338 | ; UseCSJ2K = true |
| 339 | 339 | ||
| 340 | |||
| 341 | ; Use "Trash" folder for items deleted from the scene | ||
| 342 | ; When set to True (the default) items deleted from the scene will be | ||
| 343 | ; stored in the user's trash or lost and found folder. When set to | ||
| 344 | ; False items will be removed from the scene permanently | ||
| 345 | UseTrashOnDelete = True | ||
| 346 | |||
| 340 | ; Persist avatar baked textures | 347 | ; Persist avatar baked textures |
| 341 | ; Persisting baked textures can speed up login and region border | 348 | ; Persisting baked textures can speed up login and region border |
| 342 | ; crossings especially with large numbers of users, though it | 349 | ; crossings especially with large numbers of users, though it |