diff options
| author | Jay Threeth | 2011-04-02 10:20:22 -0700 |
|---|---|---|
| committer | Jay Threeth | 2011-04-02 10:20:22 -0700 |
| commit | 952398017e47f8910dd3b02fdfc7f670bfa7e756 (patch) | |
| tree | c49a147ae2980d685858343568d505cf6db41e04 /linden/indra/newview/app_settings/settings.xml | |
| parent | checkpoint, non functional (diff) | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| download | meta-impy-952398017e47f8910dd3b02fdfc7f670bfa7e756.zip meta-impy-952398017e47f8910dd3b02fdfc7f670bfa7e756.tar.gz meta-impy-952398017e47f8910dd3b02fdfc7f670bfa7e756.tar.bz2 meta-impy-952398017e47f8910dd3b02fdfc7f670bfa7e756.tar.xz | |
Merge branch 'exp' of github.com:onefang/meta-impy into libotr
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 183a910..b6858b7 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -1711,7 +1711,7 @@ | |||
| 1711 | <key>Type</key> | 1711 | <key>Type</key> |
| 1712 | <string>Boolean</string> | 1712 | <string>Boolean</string> |
| 1713 | <key>Value</key> | 1713 | <key>Value</key> |
| 1714 | <integer>0</integer> | 1714 | <integer>1</integer> |
| 1715 | </map> | 1715 | </map> |
| 1716 | 1716 | ||
| 1717 | <key>ClientTagsListURL</key> | 1717 | <key>ClientTagsListURL</key> |
| @@ -1723,7 +1723,7 @@ | |||
| 1723 | <key>Type</key> | 1723 | <key>Type</key> |
| 1724 | <string>String</string> | 1724 | <string>String</string> |
| 1725 | <key>Value</key> | 1725 | <key>Value</key> |
| 1726 | <string>http://app.kokuaviewer.org/client_list/</string> | 1726 | <string>http://login.meta7.com/client_list.xml</string> |
| 1727 | </map> | 1727 | </map> |
| 1728 | 1728 | ||
| 1729 | <key>WarnClientTags</key> | 1729 | <key>WarnClientTags</key> |