diff options
| author | David Seikel | 2011-03-01 19:21:07 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-01 19:21:07 +1000 |
| commit | 73b58021fe17689ace7607f4ba9f6ca251e20a9e (patch) | |
| tree | 167f6f3a23bc7388956cf20aeb863cd3ea183449 /linden/indra/newview/app_settings/default_grids.xml | |
| parent | If you are going to remove a file, make sure you fix up that code tat relies ... (diff) | |
| parent | Staff, not employee. (diff) | |
| download | meta-impy-73b58021fe17689ace7607f4ba9f6ca251e20a9e.zip meta-impy-73b58021fe17689ace7607f4ba9f6ca251e20a9e.tar.gz meta-impy-73b58021fe17689ace7607f4ba9f6ca251e20a9e.tar.bz2 meta-impy-73b58021fe17689ace7607f4ba9f6ca251e20a9e.tar.xz | |
Merge branch 'branding' into weekly, with some post merge branding tweeks.
Diffstat (limited to 'linden/indra/newview/app_settings/default_grids.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/default_grids.xml | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml index 802558a..b027476 100644 --- a/linden/indra/newview/app_settings/default_grids.xml +++ b/linden/indra/newview/app_settings/default_grids.xml | |||
| @@ -194,13 +194,28 @@ | |||
| 194 | <key>gridname</key> <string>Meta7</string> | 194 | <key>gridname</key> <string>Meta7</string> |
| 195 | <key>gridnick</key> <string>meta7</string> | 195 | <key>gridnick</key> <string>meta7</string> |
| 196 | <key>platform</key> <string>OpenSim</string> | 196 | <key>platform</key> <string>OpenSim</string> |
| 197 | <key>loginuri</key> <string>http://login.meta7.com/</string> | 197 | <key>loginuri</key> <string>https://login.meta7.com/</string> |
| 198 | <key>loginpage</key> <string>http://api.meta7.com/loginscreen.php</string> | 198 | <key>loginpage</key> <string>http://api.meta7.com/loginscreen.php</string> |
| 199 | <key>helperuri</key> <string>https://secure.meta7.com/</string> | 199 | <key>helperuri</key> <string>https://login.meta7.com/secure/</string> |
| 200 | <key>password</key> <string>http://www.meta7.com/resetpass.php</string> | 200 | <key>password</key> <string>https://api.meta7.com/forgotpass.php</string> |
| 201 | <key>register</key> <string>http://www.meta7.com/register.php</string> | 201 | <key>register</key> <string>https://www.meta7.com/register.php</string> |
| 202 | <key>support</key> <string>http://www.meta7.com/support.php</string> | 202 | <key>search</key> <string>http://search.meta7.com/client_search.php?</string> |
| 203 | <key>website</key> <string>http://meta7.com/</string> | 203 | <key>support</key> <string>https://www.meta7.com/support.php</string> |
| 204 | <key>website</key> <string>http://www.meta7.com/</string> | ||
| 205 | <key>version</key> <string>0</string> | ||
| 206 | </map> | ||
| 207 | <map> | ||
| 208 | <key>gridname</key> <string>Meta7 beta</string> | ||
| 209 | <key>gridnick</key> <string>meta7beta</string> | ||
| 210 | <key>platform</key> <string>OpenSim</string> | ||
| 211 | <key>loginuri</key> <string>https://login.meta7.com/</string> | ||
| 212 | <key>loginpage</key> <string>http://api.meta7.com/loginscreen.php</string> | ||
| 213 | <key>helperuri</key> <string>https://login.meta7.com/secure/</string> | ||
| 214 | <key>password</key> <string>https://api.meta7.com/forgotpass.php</string> | ||
| 215 | <key>register</key> <string>https://www.meta7.com/register.php</string> | ||
| 216 | <key>search</key> <string>http://search.meta7.com/client_search.php?</string> | ||
| 217 | <key>support</key> <string>https://www.meta7.com/support.php</string> | ||
| 218 | <key>website</key> <string>http://www.meta7.com/</string> | ||
| 204 | <key>version</key> <string>0</string> | 219 | <key>version</key> <string>0</string> |
| 205 | </map> | 220 | </map> |
| 206 | 221 | ||