diff options
| author | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
| commit | a3b0b6c299f791b3d8132d36a3d4c1790aea86b1 (patch) | |
| tree | 07d9080e0f71845fdf07f666907422b2fe6c4a3f /linden/indra/newview/app_settings | |
| parent | Use NType to find inventory icon name (part 2 of 2). (diff) | |
| parent | VWR-1582: Local ruler mode wrong for linked objects. (diff) | |
| download | meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.zip meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.gz meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.bz2 meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.xz | |
Merge 1.1.0 alpha into quickfilter
Diffstat (limited to 'linden/indra/newview/app_settings')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 1d2da46..ca3dd81 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -664,27 +664,38 @@ | |||
| 664 | <integer>0</integer> | 664 | <integer>0</integer> |
| 665 | </array> | 665 | </array> |
| 666 | </map> | 666 | </map> |
| 667 | <key>BeaconAlwaysOn</key> | 667 | <key>BeaconsEnabled</key> |
| 668 | <map> | 668 | <map> |
| 669 | <key>Comment</key> | 669 | <key>Comment</key> |
| 670 | <string>Beacons / highlighting always on</string> | 670 | <string>Beacons / highlighting always on</string> |
| 671 | <key>Persist</key> | 671 | <key>Persist</key> |
| 672 | <integer>1</integer> | 672 | <integer>0</integer> |
| 673 | <key>Type</key> | 673 | <key>Type</key> |
| 674 | <string>Boolean</string> | 674 | <string>Boolean</string> |
| 675 | <key>Value</key> | 675 | <key>Value</key> |
| 676 | <integer>0</integer> | 676 | <integer>0</integer> |
| 677 | </map> | 677 | </map> |
| 678 | <key>BrowserHomePage</key> | 678 | <key>BrowserHome</key> |
| 679 | <map> | 679 | <map> |
| 680 | <key>Comment</key> | 680 | <key>Comment</key> |
| 681 | <string>[NOT USED]</string> | 681 | <string>Inworld browser home page</string> |
| 682 | <key>Persist</key> | 682 | <key>Persist</key> |
| 683 | <integer>1</integer> | 683 | <integer>1</integer> |
| 684 | <key>Type</key> | 684 | <key>Type</key> |
| 685 | <string>String</string> | 685 | <string>String</string> |
| 686 | <key>Value</key> | 686 | <key>Value</key> |
| 687 | <string>http://www.secondlife.com</string> | 687 | <string>http://www.imprudenceviewer.org</string> |
| 688 | </map> | ||
| 689 | <key>BrowserLastVisited</key> | ||
| 690 | <map> | ||
| 691 | <key>Comment</key> | ||
| 692 | <string>Last visited page</string> | ||
| 693 | <key>Persist</key> | ||
| 694 | <integer>0</integer> | ||
| 695 | <key>Type</key> | ||
| 696 | <string>String</string> | ||
| 697 | <key>Value</key> | ||
| 698 | <string></string> | ||
| 688 | </map> | 699 | </map> |
| 689 | <key>BlockAvatarAppearanceMessages</key> | 700 | <key>BlockAvatarAppearanceMessages</key> |
| 690 | <map> | 701 | <map> |
| @@ -6676,6 +6687,17 @@ | |||
| 6676 | <key>Value</key> | 6687 | <key>Value</key> |
| 6677 | <integer>0</integer> | 6688 | <integer>0</integer> |
| 6678 | </map> | 6689 | </map> |
| 6690 | <key>SelectCopyableOnly</key> | ||
| 6691 | <map> | ||
| 6692 | <key>Comment</key> | ||
| 6693 | <string>Select only objects you can copy</string> | ||
| 6694 | <key>Persist</key> | ||
| 6695 | <integer>1</integer> | ||
| 6696 | <key>Type</key> | ||
| 6697 | <string>Boolean</string> | ||
| 6698 | <key>Value</key> | ||
| 6699 | <integer>0</integer> | ||
| 6700 | </map> | ||
| 6679 | <key>SelectOwnedOnly</key> | 6701 | <key>SelectOwnedOnly</key> |
| 6680 | <map> | 6702 | <map> |
| 6681 | <key>Comment</key> | 6703 | <key>Comment</key> |